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

diff --git a/build/Makefile.am b/build/Makefile.am
index a9cab89..b40026a 100644 (file)
--- a/build/Makefile.am
+++ b/build/Makefile.am
@@ -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 \

diff --git a/configure.ac b/configure.ac
index d38e21f..0835b77 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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],[[        

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 35a1171..9c106f4 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -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 \

diff --git a/rpmdb/Makefile.am b/rpmdb/Makefile.am
index 4e2d923..f34f60d 100644 (file)
--- a/rpmdb/Makefile.am
+++ b/rpmdb/Makefile.am
@@ -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 \

diff --git a/rpmio/Makefile.am b/rpmio/Makefile.am
index 2d26dcc..86e5f82 100644 (file)
--- a/rpmio/Makefile.am
+++ b/rpmio/Makefile.am
@@ -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 \