diff options
| author | jbj <devnull@localhost> | 2002-12-01 21:34:06 +0000 |
|---|---|---|
| committer | jbj <devnull@localhost> | 2002-12-01 21:34:06 +0000 |
| commit | 80b23366e79f229831efb6a590c90e2724d37927 (patch) | |
| tree | e62a5951bd28e84579d84d988e3546808dcd8df3 /popt | |
| parent | 0efbbada0f3005d6f81a940ba7b06aef2703a50b (diff) | |
| download | rpm-80b23366e79f229831efb6a590c90e2724d37927.tar.gz rpm-80b23366e79f229831efb6a590c90e2724d37927.tar.bz2 rpm-80b23366e79f229831efb6a590c90e2724d37927.zip | |
- use usrlib_LTLIBRARIES to install directly in /usr/lib64 instead.
CVS patchset: 5911
CVS date: 2002/12/01 21:34:06
Diffstat (limited to 'popt')
| -rw-r--r-- | popt/.splintrc (renamed from popt/.lclintrc) | 0 | ||||
| -rw-r--r-- | popt/Makefile.am | 18 | ||||
| -rwxr-xr-x | popt/configure.ac | 7 |
3 files changed, 18 insertions, 7 deletions
diff --git a/popt/.lclintrc b/popt/.splintrc index e4294788a..e4294788a 100644 --- a/popt/.lclintrc +++ b/popt/.splintrc diff --git a/popt/Makefile.am b/popt/Makefile.am index b947f129d..5d9862c0f 100644 --- a/popt/Makefile.am +++ b/popt/Makefile.am @@ -2,6 +2,8 @@ AUTOMAKE_OPTIONS = 1.4 foreign +LINT = splint + EXTRA_DIST = autogen.sh CHANGES $(man_MANS) popt.spec \ testit.sh test-poptrc test3-data/0* \ po/*.in po/*.po po/popt.pot \ @@ -16,13 +18,13 @@ noinst_HEADERS = findme.h poptint.h system.h noinst_PROGRAMS = test1 test2 test3 test1_SOURCES = test1.c test1_LDFLAGS = -all-static -test1_LDADD = $(lib_LTLIBRARIES) +test1_LDADD = $(usrlib_LTLIBRARIES) test2_SOURCES = test2.c test2_LDFLAGS = -all-static -test2_LDADD = $(lib_LTLIBRARIES) +test2_LDADD = $(usrlib_LTLIBRARIES) test3_SOURCES = test3.c test3_LDFLAGS = -all-static -test3_LDADD = $(lib_LTLIBRARIES) +test3_LDADD = $(usrlib_LTLIBRARIES) noinst_SCRIPTS = testit.sh @@ -32,7 +34,9 @@ test1="./test1" TESTS = testit.sh include_HEADERS = popt.h -lib_LTLIBRARIES = libpopt.la + +usrlibdir = $(libdir)@MARK64@ +usrlib_LTLIBRARIES = libpopt.la libpopt_la_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c man_MANS = popt.3 @@ -46,9 +50,9 @@ popt.lcd: Makefile.am ${libpopt_la_SOURCES} ${include_HEADERS} ${noinst_HEADERS} sources: @echo $(libpopt_la_SOURCES:%=popt/%) -.PHONY: lclint -lclint: - lclint ${DEFS} ${INCLUDES} test1.c ${libpopt_la_SOURCES} +.PHONY: lint +lint: + $(LINT) ${DEFS} ${INCLUDES} test1.c ${libpopt_la_SOURCES} CVSTAG = $(PACKAGE)-$(subst .,_,$(VERSION)) diff --git a/popt/configure.ac b/popt/configure.ac index ce49069c4..d8dcceece 100755 --- a/popt/configure.ac +++ b/popt/configure.ac @@ -51,6 +51,13 @@ else fi AC_SUBST(TARGET) +dnl XXX Choose /usr/lib or /usr/lib64 for library installs. +MARK64= +case "${target_cpu}" in +x86_64*) MARK64=64 ;; +esac +AC_SUBST(MARK64) + AC_CHECK_HEADERS(alloca.h float.h libintl.h mcheck.h unistd.h) AC_MSG_CHECKING(for /usr/ucblib in LIBS) if test -d /usr/ucblib ; then |