2008-09-12 20:37:28 +02:00
|
|
|
Index: popt/Makefile.am
|
|
|
|
===================================================================
|
|
|
|
--- popt/Makefile.am.orig
|
2007-03-23 17:13:50 +01:00
|
|
|
+++ popt/Makefile.am
|
2008-09-12 20:37:28 +02:00
|
|
|
@@ -17,13 +17,13 @@ noinst_HEADERS = findme.h poptint.h syst
|
2007-03-23 17:13:50 +01:00
|
|
|
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
|
|
|
|
|
2008-09-12 20:37:28 +02:00
|
|
|
@@ -34,8 +34,8 @@ TESTS = testit.sh
|
2007-03-23 17:13:50 +01:00
|
|
|
|
|
|
|
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
|
2008-09-12 20:37:28 +02:00
|
|
|
libpopt_la_LDFLAGS = @INTLLIBS@
|