folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Set libdir /usr/lib vs lib64 directly, drop MARK64 stuff

This commit is contained in:
Panu Matilainen 2007-07-25 17:10:57 +03:00
parent 2e1a7ca2f7
commit 4bcd08549d
5 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/Makefile.am
View File

@ -24,7 +24,7 @@ noinst_HEADERS = buildio.h
LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir)
usrlibdir = $(libdir)@MARK64@
usrlibdir = $(libdir)
usrlib_LTLIBRARIES = librpmbuild.la
librpmbuild_la_SOURCES = \
build.c expression.c files.c misc.c names.c pack.c \

15
configure.ac
View File

@ -1,5 +1,5 @@
AC_PREREQ(2.59)
AC_INIT(rpm, 4.4.2.1-rc2, rpm-maint@lists.rpm.org)
AC_INIT(rpm, 4.4.90, rpm-maint@lists.rpm.org)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([rpmqv.c])
AM_CONFIG_HEADER([config.h])
@ -1122,13 +1122,6 @@ else
ln -s ${srcdir}/autodeps/none ./find-requires
fi
dnl XXX Choose /usr/lib or /usr/lib64 for library installs.
MARK64=
case "${target_cpu}" in
x86_64*|ppc64*|powerpc64*|sparc64*|s390x*) MARK64=64 ;;
esac
AC_SUBST(MARK64)
dnl Determine the canonical arch-vendor-os for the build machine
autorelocate_path='%{nil}'
autorelocate_dcolor='0'
@ -1186,7 +1179,12 @@ AC_DEFINE_UNQUOTED(LOCALEDIR, "$LOCALEDIR",
[Full path to rpm locale directory (usually /usr/share/locale)])
AC_SUBST(LOCALEDIR)
LIBDIR="`echo $libdir | sed 's-/lib$-/%{_lib}-'`"
dnl XXX Choose /usr/lib or /usr/lib64 for library installs.
case "${target_cpu}" in
x86_64*|ppc64*|powerpc64*|sparc64*|s390x*) LIBDIR="${LIBIR}64" ;;
esac
AC_SUBST(LIBDIR)
RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`"
AC_DEFINE_UNQUOTED(RPMCONFIGDIR, "$RPMCONFIGDIR",
[Full path to rpm global configuration directory (usually /usr/lib/rpm)])
@ -1249,7 +1247,6 @@ AC_CONFIG_FILES([ Doxyfile Makefile rpmrc macros platform rpm.pc rpmpopt
doc/ru/Makefile
doc/sk/Makefile
python/Makefile
python/rpm/Makefile
lua/Makefile
])
AC_CONFIG_COMMANDS([default],[[

2
lib/Makefile.am
View File

@ -31,7 +31,7 @@ LIBS =
LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir)
usrlibdir = $(libdir)@MARK64@
usrlibdir = $(libdir)
usrlib_LTLIBRARIES = librpm.la
librpm_la_SOURCES = \
cpio.c depends.c formats.c fs.c fsm.c getdate.c \

2
rpmdb/Makefile.am
View File

@ -44,7 +44,7 @@ libdb_la = $(top_builddir)/$(WITH_DB_SUBDIR)/libdb.la
# XXX grrr, RPM_BUILD_ROOT prevents build pollution if/when -lrpm different
LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir)
usrlibdir = $(libdir)@MARK64@
usrlibdir = $(libdir)
usrlib_LTLIBRARIES = librpmdb.la
librpmdb_la_SOURCES = \
dbconfig.c fprint.c \

2
rpmio/Makefile.am
View File

@ -28,7 +28,7 @@ BEECRYPTLOBJS = $(shell test X"@WITH_BEECRYPT_SUBDIR@" != X && cat $(top_builddi
LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir)
usrlibdir = $(libdir)@MARK64@
usrlibdir = $(libdir)
usrlib_LTLIBRARIES = librpmio.la
librpmio_la_SOURCES = \
argv.c digest.c fts.c macro.c rpmdav.c \