rpm/popt-to-lib.diff

32 lines
814 B
Diff

diff -u popt/Makefile.am popt/Makefile.am
--- popt/Makefile.am
+++ popt/Makefile.am
@@ -18,13 +18,13 @@
noinst_PROGRAMS = test1 test2 test3
test1_SOURCES = test1.c
test1_LDFLAGS =
-test1_LDADD = $(usrlib_LTLIBRARIES)
+test1_LDADD = $(popt_LTLIBRARIES)
test2_SOURCES = test2.c
test2_LDFLAGS =
-test2_LDADD = $(usrlib_LTLIBRARIES)
+test2_LDADD = $(popt_LTLIBRARIES)
test3_SOURCES = test3.c
test3_LDFLAGS =
-test3_LDADD = $(usrlib_LTLIBRARIES)
+test3_LDADD = $(popt_LTLIBRARIES)
noinst_SCRIPTS = testit.sh
@@ -35,8 +35,8 @@
include_HEADERS = popt.h
-usrlibdir = $(libdir)@MARK64@
-usrlib_LTLIBRARIES = libpopt.la
+poptdir = /lib@MARK64@
+popt_LTLIBRARIES = libpopt.la
libpopt_la_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c
libpopt_la_LDFLAGS = @INTLLIBS@ -version-info 8:0:7