diff --git a/ChangeLog b/ChangeLog index ea291dac..0a126a6f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17004,3 +17004,5 @@ * Refactored table drops to use 'RDApplication::dropTable()'. 2018-05-31 Fred Gleason * Incremented the package version to 2.19.2vlog02. +2018-05-31 Fred Gleason + * Fixed a regression that broke the 'make rpm' target. diff --git a/configure.ac b/configure.ac index 37609fbe..c17ef627 100644 --- a/configure.ac +++ b/configure.ac @@ -100,8 +100,13 @@ fi AR_GCC_TARGET() AC_SUBST(VENDOR,$ar_gcc_distro) AC_SUBST(ARCH,$ar_gcc_arch) -LIB_PATH=$PREFIX/lib -AC_SUBST(RD_LIB_PATH,lib) +if test $ar_gcc_arch = x86_64 ; then + LIB_PATH=$PREFIX/lib64 + AC_SUBST(RD_LIB_PATH,lib64) +else + LIB_PATH=$PREFIX/lib + AC_SUBST(RD_LIB_PATH,lib) +fi # # Determine Distro diff --git a/pam_rd/Makefile.am b/pam_rd/Makefile.am index 79bcf0ed..1afbdd51 100644 --- a/pam_rd/Makefile.am +++ b/pam_rd/Makefile.am @@ -31,7 +31,8 @@ moc_%.cpp: %.h inst_prefix_dir=$(DESTDIR) inst_lib_LTLIBRARIES = pam_rd.la -inst_libdir=$(prefix)/@RD_LIB_PATH@/security +##inst_libdir=$(prefix)/@RD_LIB_PATH@/security +inst_libdir=/@RD_LIB_PATH@/security dist_pam_rd_la_SOURCES = pam_rd.cpp pam_rd_la_LDFLAGS = -module -shared -Xlinker -x -avoid-version -export-dynamic pam_rd_la_LIBADD = @LIB_RDLIBS@ -lpam @LIBVORBIS@