From c01ac65a78ad194673ec02026bd1ca229b931791 Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Wed, 21 Sep 2005 13:27:10 +0000 Subject: Relevant BUGIDs: Purpose of commit: new feature Commit summary: --------------- Allow out of tree builds --- doc/Makefile.am | 35 ++++++++++++++++++------------- libpam/Makefile.am | 7 ++++--- libpam_misc/Makefile.am | 2 +- libpamc/Makefile.am | 2 +- modules/pam_access/Makefile.am | 2 +- modules/pam_cracklib/Makefile.am | 2 +- modules/pam_debug/Makefile.am | 2 +- modules/pam_deny/Makefile.am | 2 +- modules/pam_echo/Makefile.am | 2 +- modules/pam_env/Makefile.am | 2 +- modules/pam_filter/Makefile.am | 2 +- modules/pam_filter/upperLOWER/Makefile.am | 2 +- modules/pam_ftp/Makefile.am | 2 +- modules/pam_group/Makefile.am | 2 +- modules/pam_issue/Makefile.am | 2 +- modules/pam_lastlog/Makefile.am | 2 +- modules/pam_limits/Makefile.am | 2 +- modules/pam_listfile/Makefile.am | 2 +- modules/pam_localuser/Makefile.am | 2 +- modules/pam_mail/Makefile.am | 2 +- modules/pam_mkhomedir/Makefile.am | 2 +- modules/pam_motd/Makefile.am | 2 +- modules/pam_nologin/Makefile.am | 2 +- modules/pam_permit/Makefile.am | 2 +- modules/pam_pwdb/Makefile.am | 2 +- modules/pam_rhosts/Makefile.am | 2 +- modules/pam_rootok/Makefile.am | 2 +- modules/pam_securetty/Makefile.am | 2 +- modules/pam_selinux/Makefile.am | 2 +- modules/pam_shells/Makefile.am | 2 +- modules/pam_stress/Makefile.am | 2 +- modules/pam_succeed_if/Makefile.am | 2 +- modules/pam_tally/Makefile.am | 2 +- modules/pam_time/Makefile.am | 2 +- modules/pam_umask/Makefile.am | 2 +- modules/pam_unix/Makefile.am | 2 +- modules/pam_userdb/Makefile.am | 2 +- modules/pam_warn/Makefile.am | 2 +- modules/pam_wheel/Makefile.am | 2 +- modules/pam_xauth/Makefile.am | 2 +- 40 files changed, 62 insertions(+), 56 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index 39bbca7e..81b24b4c 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -3,14 +3,14 @@ # FILES=pam pam_appl pam_modules -FSRCS=pam_appl.sgml pam_modules.sgml +FSRCS=$(srcdir)/pam_appl.sgml $(srcdir)/pam_modules.sgml TEXTS=txts/pam.txt txts/pam_appl.txt txts/pam_modules.txt HTMLS=html/pam.html html/pam_appl.html html/pam_modules.html PSFILES=ps/pam.ps ps/pam_appl.ps ps/pam_modules.ps PDFFILES=pdf/pam.pdf pdf/pam_appl.pdf pdf/pam_modules.pdf -MODULES=$(shell ls modules/*.sgml) +MODULES=$(shell ls $(srcdir)/modules/*.sgml) CLEANFILES = *~ */*~ $(TEXTS) $(PSFILES) $(PDFFILES) html/pam*.html \ ps/missfont.log MODULES-SGML pam.sgml \ @@ -32,13 +32,14 @@ all: html text postscript pdf html: $(HTMLS) -$(HTMLS) : $(FSRCS) pam.sgml +$(HTMLS) : $(FSRCS) $(srcdir)/pam.sgml @echo 'Building html documentation from files in modules/*.sgml' if HAVE_SGML2HTML @for i in $(FILES) ; do \ - if [ ! -f "html/$$i.html" ] || [ "$$i.sgml" -nt "html/$$i.html" ]; \ + if [ ! -f "html/$$i.html" ] || [ "$(srcdir)/$$i.sgml" -nt "html/$$i.html" ]; \ then \ - cd html ; sgml2html ../$$i ; \ + mkdir -p html ; \ + cd html ; sgml2html ../$(srcdir)/$$i ; \ if [ $$? -ne 0 ]; then exit 1 ; fi ; \ cd .. ; \ fi ; \ @@ -49,13 +50,14 @@ endif text: $(TEXTS) -$(TEXTS) : $(FSRCS) pam.sgml +$(TEXTS) : $(FSRCS) $(srcdir)/pam.sgml @echo 'Building text documentation from files in modules/*.sgml' if HAVE_SGML2TXT @for i in $(FILES) ; do \ if [ ! -f "txts/$$i.txt" ] \ - || [ "$$i.sgml" -nt "txts/$$i.txt" ]; then \ - cd txts ; sgml2txt ../$$i ; cd .. ; \ + || [ "$(srcdir)/$$i.sgml" -nt "txts/$$i.txt" ]; then \ + mkdir -p txts ; \ + cd txts ; sgml2txt ../$(srcdir)/$$i ; cd .. ; \ fi ; \ done else @@ -64,12 +66,13 @@ endif postscript: $(PSFILES) -$(PSFILES): $(FSRCS) pam.sgml +$(PSFILES): $(FSRCS) $(srcdir)/pam.sgml @echo 'Building postscript documentation from files in modules/*.sgml' if HAVE_SGML2PS @for i in $(FILES) ; do \ - if [ ! -f "ps/$$i.ps" ] || [ "$$i.sgml" -nt "ps/$$i.ps" ]; then \ - cd ps ; $(PSER) ../$$i ; cd .. ; \ + if [ ! -f "ps/$$i.ps" ] || [ "$(srcdir)/$$i.sgml" -nt "ps/$$i.ps" ]; then \ + mkdir -p ps ; \ + cd ps ; $(PSER) ../$(srcdir)/$$i ; cd .. ; \ fi ; \ done else @@ -84,6 +87,7 @@ if HAVE_SGML2PS if HAVE_PS2PDF @for i in $(FILES) ; do \ if [ ! -f "pdf/$$i.pdf" ] || [ "ps/$$i.ps" -nt "ps/$$i.pdf" ]; then \ + mkdir -p pdf ; \ ps2pdf ps/$$i.ps pdf/$$i.pdf ; \ fi ; \ done @@ -94,16 +98,17 @@ else @echo XXX - neither sgml2ps nor sgml2latex binaries are installed endif -pam.sgml: pam_source.sgml MODULES-SGML CREDITS - @sed -e '/^/r MODULES-SGML' pam_source.sgml | sed -e '/^/r CREDITS' > pam.sgml +$(srcdir)/pam.sgml: $(srcdir)/pam_source.sgml MODULES-SGML CREDITS + @sed -e '/^/r MODULES-SGML' $(srcdir)/pam_source.sgml |\ + sed -e '/^/r CREDITS' > $(srcdir)/pam.sgml MODULES-SGML: $(MODULES) @echo 'Building module text from files in modules/*.sgml' @rm -f MODULES-SGML @echo '' >> MODULES-SGML - @cat modules/*.sgml >> MODULES-SGML + @cat $(srcdir)/modules/*.sgml >> MODULES-SGML extraclean: clean diff --git a/libpam/Makefile.am b/libpam/Makefile.am index 2d06e416..d7472b71 100644 --- a/libpam/Makefile.am +++ b/libpam/Makefile.am @@ -10,13 +10,14 @@ CLEANFILES = *~ EXTRA_DIST = libpam.map -include_HEADERS = $(addprefix include/security/, _pam_compat.h _pam_macros.h _pam_types.h pam_appl.h pam_malloc.h pam_modules.h pam_ext.h) +include_HEADERS = $(addprefix include/security/, _pam_compat.h _pam_macros.h _pam_types.h \ + pam_appl.h pam_malloc.h pam_modules.h pam_ext.h pam_modutil.h) -noinst_HEADERS = pam_prelude.h pam_private.h pam_tokens.h +noinst_HEADERS = pam_prelude.h pam_private.h pam_tokens.h pam_modutil_private.h libpam_la_LDFLAGS = -no-undefined -version-info 81:0:81 if HAVE_VERSIONING - libpam_la_LDFLAGS += -Wl,--version-script=libpam.map + libpam_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libpam.map endif lib_LTLIBRARIES = libpam.la diff --git a/libpam_misc/Makefile.am b/libpam_misc/Makefile.am index eec75759..6a168336 100644 --- a/libpam_misc/Makefile.am +++ b/libpam_misc/Makefile.am @@ -13,7 +13,7 @@ AM_CFLAGS = -I$(top_srcdir)/libpam/include \ libpam_misc_la_LDFLAGS = -no-undefined -version-info 81:0:81 if HAVE_VERSIONING - libpam_misc_la_LDFLAGS += -Wl,--version-script=libpam_misc.map + libpam_misc_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libpam_misc.map endif libpam_misc_la_LIBADD = $(top_builddir)/libpam/libpam.la diff --git a/libpamc/Makefile.am b/libpamc/Makefile.am index 9465dd3e..b57beb24 100644 --- a/libpamc/Makefile.am +++ b/libpamc/Makefile.am @@ -16,7 +16,7 @@ AM_CFLAGS=-I$(top_srcdir)/libpam/include -I$(srcdir)/include libpamc_la_LDFLAGS = -no-undefined -version-info 81:0:81 if HAVE_VERSIONING - libpamc_la_LDFLAGS += -Wl,--version-script=libpamc.map + libpamc_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libpamc.map endif lib_LTLIBRARIES = libpamc.la diff --git a/modules/pam_access/Makefile.am b/modules/pam_access/Makefile.am index 94f7048b..96476f41 100644 --- a/modules/pam_access/Makefile.am +++ b/modules/pam_access/Makefile.am @@ -14,7 +14,7 @@ AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \ AM_LDFLAGS = -no-undefined -avoid-version -module \ -L$(top_builddir)/libpam -lpam @LIBNSL@ if HAVE_VERSIONING - AM_LDFLAGS += -Wl,--version-script=../modules.map + AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map endif securelib_LTLIBRARIES = pam_access.la diff --git a/modules/pam_cracklib/Makefile.am b/modules/pam_cracklib/Makefile.am index 29bc017b..c1f6a8f4 100644 --- a/modules/pam_cracklib/Makefile.am +++ b/modules/pam_cracklib/Makefile.am @@ -13,7 +13,7 @@ AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include AM_LDFLAGS = -no-undefined -avoid-version -module \ -L$(top_builddir)/libpam -lpam if HAVE_VERSIONING - AM_LDFLAGS += -Wl,--version-script=../modules.map + AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map endif if HAVE_LIBCRACK diff --git a/modules/pam_debug/Makefile.am b/modules/pam_debug/Makefile.am index 4b1bfec8..98be61f1 100644 --- a/modules/pam_debug/Makefile.am +++ b/modules/pam_debug/Makefile.am @@ -13,7 +13,7 @@ AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include AM_LDFLAGS = -no-undefined -avoid-version -module \ -L$(top_builddir)/libpam -lpam if HAVE_VERSIONING - AM_LDFLAGS += -Wl,--version-script=../modules.map + AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map endif securelib_LTLIBRARIES = pam_debug.la diff --git a/modules/pam_deny/Makefile.am b/modules/pam_deny/Makefile.am index eeb6b78d..4fe567a6 100644 --- a/modules/pam_deny/Makefile.am +++ b/modules/pam_deny/Makefile.am @@ -13,7 +13,7 @@ AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include AM_LDFLAGS = -no-undefined -avoid-version -module \ -L$(top_builddir)/libpam -lpam if HAVE_VERSIONING - AM_LDFLAGS += -Wl,--version-script=../modules.map + AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map endif securelib_LTLIBRARIES = pam_deny.la diff --git a/modules/pam_echo/Makefile.am b/modules/pam_echo/Makefile.am index 853f51cc..03818d37 100644 --- a/modules/pam_echo/Makefile.am +++ b/modules/pam_echo/Makefile.am @@ -15,7 +15,7 @@ AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include AM_LDFLAGS = -no-undefined -avoid-version -module \ -L$(top_builddir)/libpam -lpam if HAVE_VERSIONING - AM_LDFLAGS += -Wl,--version-script=../modules.map + AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map endif securelib_LTLIBRARIES = pam_echo.la diff --git a/modules/pam_env/Makefile.am b/modules/pam_env/Makefile.am index 79a03e09..d113ac33 100644 --- a/modules/pam_env/Makefile.am +++ b/modules/pam_env/Makefile.am @@ -14,7 +14,7 @@ AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \ AM_LDFLAGS = -no-undefined -avoid-version -module \ -L$(top_builddir)/libpam -lpam if HAVE_VERSIONING - AM_LDFLAGS += -Wl,--version-script=../modules.map + AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map endif securelib_LTLIBRARIES = pam_env.la diff --git a/modules/pam_filter/Makefile.am b/modules/pam_filter/Makefile.am index 6993592d..9303431f 100644 --- a/modules/pam_filter/Makefile.am +++ b/modules/pam_filter/Makefile.am @@ -15,7 +15,7 @@ AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include AM_LDFLAGS = -no-undefined -avoid-version -module \ -L$(top_builddir)/libpam -lpam if HAVE_VERSIONING - AM_LDFLAGS += -Wl,--version-script=../modules.map + AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map endif include_HEADERS=pam_filter.h diff --git a/modules/pam_filter/upperLOWER/Makefile.am b/modules/pam_filter/upperLOWER/Makefile.am index d49de828..bcaaa81a 100644 --- a/modules/pam_filter/upperLOWER/Makefile.am +++ b/modules/pam_filter/upperLOWER/Makefile.am @@ -8,7 +8,7 @@ securelibfilterdir = $(SECUREDIR)/pam_filter AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \ - -I.. + -I$(srcdir)/.. AM_LDFLAGS = -L$(top_builddir)/libpam -lpam securelibfilter_PROGRAMS = upperLOWER diff --git a/modules/pam_ftp/Makefile.am b/modules/pam_ftp/Makefile.am index 4fd85bdc..1cd5cf69 100644 --- a/modules/pam_ftp/Makefile.am +++ b/modules/pam_ftp/Makefile.am @@ -13,7 +13,7 @@ AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include AM_LDFLAGS = -no-undefined -avoid-version -module \ -L$(top_builddir)/libpam -lpam if HAVE_VERSIONING - AM_LDFLAGS += -Wl,--version-script=../modules.map + AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map endif securelib_LTLIBRARIES = pam_ftp.la diff --git a/modules/pam_group/Makefile.am b/modules/pam_group/Makefile.am index 73a88676..72faba4b 100644 --- a/modules/pam_group/Makefile.am +++ b/modules/pam_group/Makefile.am @@ -14,7 +14,7 @@ AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \ AM_LDFLAGS = -no-undefined -avoid-version -module \ -L$(top_builddir)/libpam -lpam if HAVE_VERSIONING - AM_LDFLAGS += -Wl,--version-script=../modules.map + AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map endif securelib_LTLIBRARIES = pam_group.la diff --git a/modules/pam_issue/Makefile.am b/modules/pam_issue/Makefile.am index 761833c4..02e167c5 100644 --- a/modules/pam_issue/Makefile.am +++ b/modules/pam_issue/Makefile.am @@ -11,7 +11,7 @@ AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include AM_LDFLAGS = -no-undefined -avoid-version -module \ -L$(top_builddir)/libpam -lpam if HAVE_VERSIONING - AM_LDFLAGS += -Wl,--version-script=../modules.map + AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map endif securelib_LTLIBRARIES = pam_issue.la diff --git a/modules/pam_lastlog/Makefile.am b/modules/pam_lastlog/Makefile.am index dc2fc631..ad1a6619 100644 --- a/modules/pam_lastlog/Makefile.am +++ b/modules/pam_lastlog/Makefile.am @@ -11,7 +11,7 @@ AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include AM_LDFLAGS = -no-undefined -avoid-version -module \ -L$(top_builddir)/libpam -lpam -lutil if HAVE_VERSIONING - AM_LDFLAGS += -Wl,--version-script=../modules.map + AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map endif securelib_LTLIBRARIES = pam_lastlog.la diff --git a/modules/pam_limits/Makefile.am b/modules/pam_limits/Makefile.am index cb6085b9..c671a8f1 100644 --- a/modules/pam_limits/Makefile.am +++ b/modules/pam_limits/Makefile.am @@ -14,7 +14,7 @@ AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \ AM_LDFLAGS = -no-undefined -avoid-version -module \ -L$(top_builddir)/libpam -lpam if HAVE_VERSIONING - AM_LDFLAGS += -Wl,--version-script=../modules.map + AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map endif securelib_LTLIBRARIES = pam_limits.la diff --git a/modules/pam_listfile/Makefile.am b/modules/pam_listfile/Makefile.am index d622d7b6..3e4092c3 100644 --- a/modules/pam_listfile/Makefile.am +++ b/modules/pam_listfile/Makefile.am @@ -13,7 +13,7 @@ AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include AM_LDFLAGS = -no-undefined -avoid-version -module \ -L$(top_builddir)/libpam -lpam if HAVE_VERSIONING - AM_LDFLAGS += -Wl,--version-script=../modules.map + AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map endif securelib_LTLIBRARIES = pam_listfile.la diff --git a/modules/pam_localuser/Makefile.am b/modules/pam_localuser/Makefile.am index 689266d2..1fdee5b0 100644 --- a/modules/pam_localuser/Makefile.am +++ b/modules/pam_localuser/Makefile.am @@ -15,7 +15,7 @@ AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include AM_LDFLAGS = -no-undefined -avoid-version -module \ -L$(top_builddir)/libpam -lpam if HAVE_VERSIONING - AM_LDFLAGS += -Wl,--version-script=../modules.map + AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map endif securelib_LTLIBRARIES = pam_localuser.la diff --git a/modules/pam_mail/Makefile.am b/modules/pam_mail/Makefile.am index 733fa6ae..a70bc7b7 100644 --- a/modules/pam_mail/Makefile.am +++ b/modules/pam_mail/Makefile.am @@ -13,7 +13,7 @@ AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include AM_LDFLAGS = -no-undefined -avoid-version -module \ -L$(top_builddir)/libpam -lpam if HAVE_VERSIONING - AM_LDFLAGS += -Wl,--version-script=../modules.map + AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map endif securelib_LTLIBRARIES = pam_mail.la diff --git a/modules/pam_mkhomedir/Makefile.am b/modules/pam_mkhomedir/Makefile.am index 641a5618..f795dcd9 100644 --- a/modules/pam_mkhomedir/Makefile.am +++ b/modules/pam_mkhomedir/Makefile.am @@ -13,7 +13,7 @@ AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include AM_LDFLAGS = -no-undefined -avoid-version -module \ -L$(top_builddir)/libpam -lpam if HAVE_VERSIONING - AM_LDFLAGS += -Wl,--version-script=../modules.map + AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map endif securelib_LTLIBRARIES = pam_mkhomedir.la diff --git a/modules/pam_motd/Makefile.am b/modules/pam_motd/Makefile.am index b35883b7..59766b89 100644 --- a/modules/pam_motd/Makefile.am +++ b/modules/pam_motd/Makefile.am @@ -11,7 +11,7 @@ AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include AM_LDFLAGS = -no-undefined -avoid-version -module \ -L$(top_builddir)/libpam -lpam if HAVE_VERSIONING - AM_LDFLAGS += -Wl,--version-script=../modules.map + AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map endif securelib_LTLIBRARIES = pam_motd.la diff --git a/modules/pam_nologin/Makefile.am b/modules/pam_nologin/Makefile.am index 8c483f9a..d6c061d6 100644 --- a/modules/pam_nologin/Makefile.am +++ b/modules/pam_nologin/Makefile.am @@ -15,7 +15,7 @@ AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include AM_LDFLAGS = -no-undefined -avoid-version -module \ -L$(top_builddir)/libpam -lpam if HAVE_VERSIONING - AM_LDFLAGS += -Wl,--version-script=../modules.map + AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map endif securelib_LTLIBRARIES = pam_nologin.la diff --git a/modules/pam_permit/Makefile.am b/modules/pam_permit/Makefile.am index 6ba98769..82854194 100644 --- a/modules/pam_permit/Makefile.am +++ b/modules/pam_permit/Makefile.am @@ -13,7 +13,7 @@ AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include AM_LDFLAGS = -no-undefined -avoid-version -module \ -L$(top_builddir)/libpam -lpam if HAVE_VERSIONING - AM_LDFLAGS += -Wl,--version-script=../modules.map + AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map endif securelib_LTLIBRARIES = pam_permit.la diff --git a/modules/pam_pwdb/Makefile.am b/modules/pam_pwdb/Makefile.am index 09b6e233..8831e2e8 100644 --- a/modules/pam_pwdb/Makefile.am +++ b/modules/pam_pwdb/Makefile.am @@ -18,7 +18,7 @@ AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \ AM_LDFLAGS = -no-undefined -avoid-version -module \ -L$(top_builddir)/libpam -lpam @LIBCRYPT@ @LIBPWDB@ if HAVE_VERSIONING - AM_LDFLAGS += -Wl,--version-script=../modules.map + AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map endif if HAVE_LIBPWDB diff --git a/modules/pam_rhosts/Makefile.am b/modules/pam_rhosts/Makefile.am index e0fec5dd..ef5f3d0a 100644 --- a/modules/pam_rhosts/Makefile.am +++ b/modules/pam_rhosts/Makefile.am @@ -13,7 +13,7 @@ AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include AM_LDFLAGS = -no-undefined -avoid-version -module \ -L$(top_builddir)/libpam -lpam if HAVE_VERSIONING - AM_LDFLAGS += -Wl,--version-script=../modules.map + AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map endif securelib_LTLIBRARIES = pam_rhosts_auth.la diff --git a/modules/pam_rootok/Makefile.am b/modules/pam_rootok/Makefile.am index 132168cd..507dc992 100644 --- a/modules/pam_rootok/Makefile.am +++ b/modules/pam_rootok/Makefile.am @@ -16,7 +16,7 @@ endif AM_LDFLAGS = -no-undefined -avoid-version -module \ -L$(top_builddir)/libpam -lpam @LIBSELINUX@ if HAVE_VERSIONING - AM_LDFLAGS += -Wl,--version-script=../modules.map + AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map endif securelib_LTLIBRARIES = pam_rootok.la diff --git a/modules/pam_securetty/Makefile.am b/modules/pam_securetty/Makefile.am index c79bee4b..00c46e9f 100644 --- a/modules/pam_securetty/Makefile.am +++ b/modules/pam_securetty/Makefile.am @@ -15,7 +15,7 @@ AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include AM_LDFLAGS = -no-undefined -avoid-version -module \ -L$(top_builddir)/libpam -lpam if HAVE_VERSIONING - AM_LDFLAGS += -Wl,--version-script=../modules.map + AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map endif securelib_LTLIBRARIES = pam_securetty.la diff --git a/modules/pam_selinux/Makefile.am b/modules/pam_selinux/Makefile.am index 5dfe6a5d..0cab19ff 100644 --- a/modules/pam_selinux/Makefile.am +++ b/modules/pam_selinux/Makefile.am @@ -20,7 +20,7 @@ pam_selinux_check_LDFLAGS = -L$(top_builddir)/libpam_misc -lpam_misc if HAVE_VERSIONING pam_selinux_la_LDFLAGS = -avoid-version -module \ - -Wl,--version-script=../modules.map + -Wl,--version-script=$(srcdir)/../modules.map endif if HAVE_LIBSELINUX diff --git a/modules/pam_shells/Makefile.am b/modules/pam_shells/Makefile.am index 4eef6288..c0d6a6c4 100644 --- a/modules/pam_shells/Makefile.am +++ b/modules/pam_shells/Makefile.am @@ -13,7 +13,7 @@ AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include AM_LDFLAGS = -no-undefined -avoid-version -module \ -L$(top_builddir)/libpam -lpam if HAVE_VERSIONING - AM_LDFLAGS += -Wl,--version-script=../modules.map + AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map endif securelib_LTLIBRARIES = pam_shells.la diff --git a/modules/pam_stress/Makefile.am b/modules/pam_stress/Makefile.am index 5aec6a4c..1fcbde7d 100644 --- a/modules/pam_stress/Makefile.am +++ b/modules/pam_stress/Makefile.am @@ -13,6 +13,6 @@ AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include AM_LDFLAGS = -no-undefined -avoid-version -module \ -L$(top_builddir)/libpam -lpam if HAVE_VERSIONING - AM_LDFLAGS += -Wl,--version-script=../modules.map + AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map endif securelib_LTLIBRARIES = pam_stress.la diff --git a/modules/pam_succeed_if/Makefile.am b/modules/pam_succeed_if/Makefile.am index 71a63dc1..a13e5c66 100644 --- a/modules/pam_succeed_if/Makefile.am +++ b/modules/pam_succeed_if/Makefile.am @@ -15,7 +15,7 @@ AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include AM_LDFLAGS = -no-undefined -avoid-version -module \ -L$(top_builddir)/libpam -lpam if HAVE_VERSIONING - AM_LDFLAGS += -Wl,--version-script=../modules.map + AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map endif securelib_LTLIBRARIES = pam_succeed_if.la diff --git a/modules/pam_tally/Makefile.am b/modules/pam_tally/Makefile.am index 73c819c4..c7aacc0d 100644 --- a/modules/pam_tally/Makefile.am +++ b/modules/pam_tally/Makefile.am @@ -17,7 +17,7 @@ AM_LDFLAGS = -no-undefined -avoid-version -module \ pam_tally_la_LDFLAGS = -no-undefined -avoid-version -module if HAVE_VERSIONING - pam_tally_la_LDFLAGS += -Wl,--version-script=../modules.map + pam_tally_la_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map endif securelib_LTLIBRARIES = pam_tally.la diff --git a/modules/pam_time/Makefile.am b/modules/pam_time/Makefile.am index 8a84ef78..91632af0 100644 --- a/modules/pam_time/Makefile.am +++ b/modules/pam_time/Makefile.am @@ -14,7 +14,7 @@ AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \ AM_LDFLAGS = -no-undefined -avoid-version -module \ -L$(top_builddir)/libpam -lpam if HAVE_VERSIONING - AM_LDFLAGS += -Wl,--version-script=../modules.map + AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map endif securelib_LTLIBRARIES = pam_time.la diff --git a/modules/pam_umask/Makefile.am b/modules/pam_umask/Makefile.am index abc1cd68..709cbd28 100644 --- a/modules/pam_umask/Makefile.am +++ b/modules/pam_umask/Makefile.am @@ -13,7 +13,7 @@ AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include AM_LDFLAGS = -no-undefined -avoid-version -module \ -L$(top_builddir)/libpam -lpam if HAVE_VERSIONING - AM_LDFLAGS += -Wl,--version-script=../modules.map + AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map endif securelib_LTLIBRARIES = pam_umask.la diff --git a/modules/pam_unix/Makefile.am b/modules/pam_unix/Makefile.am index 608a095f..fe884e77 100644 --- a/modules/pam_unix/Makefile.am +++ b/modules/pam_unix/Makefile.am @@ -26,7 +26,7 @@ endif pam_unix_la_LDFLAGS = -no-undefined -avoid-version -module \ @LIBCRACK@ @LIBNSL@ if HAVE_VERSIONING - pam_unix_la_LDFLAGS += -Wl,--version-script=../modules.map + pam_unix_la_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map endif securelib_LTLIBRARIES = pam_unix.la diff --git a/modules/pam_userdb/Makefile.am b/modules/pam_userdb/Makefile.am index 080ff6b1..320f90bf 100644 --- a/modules/pam_userdb/Makefile.am +++ b/modules/pam_userdb/Makefile.am @@ -13,7 +13,7 @@ AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include AM_LDFLAGS = -no-undefined -avoid-version -module \ -L$(top_builddir)/libpam -lpam @LIBDB@ @LIBCRYPT@ if HAVE_VERSIONING - AM_LDFLAGS += -Wl,--version-script=../modules.map + AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map endif if HAVE_LIBDB diff --git a/modules/pam_warn/Makefile.am b/modules/pam_warn/Makefile.am index 5cdb6668..7fab3f41 100644 --- a/modules/pam_warn/Makefile.am +++ b/modules/pam_warn/Makefile.am @@ -13,7 +13,7 @@ AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include AM_LDFLAGS = -no-undefined -avoid-version -module \ -L$(top_builddir)/libpam -lpam if HAVE_VERSIONING - AM_LDFLAGS += -Wl,--version-script=../modules.map + AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map endif securelib_LTLIBRARIES = pam_warn.la diff --git a/modules/pam_wheel/Makefile.am b/modules/pam_wheel/Makefile.am index 0b098be1..52af7a44 100644 --- a/modules/pam_wheel/Makefile.am +++ b/modules/pam_wheel/Makefile.am @@ -13,7 +13,7 @@ AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include AM_LDFLAGS = -no-undefined -avoid-version -module \ -L$(top_builddir)/libpam -lpam if HAVE_VERSIONING - AM_LDFLAGS += -Wl,--version-script=../modules.map + AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map endif securelib_LTLIBRARIES = pam_wheel.la diff --git a/modules/pam_xauth/Makefile.am b/modules/pam_xauth/Makefile.am index 2dc65cd6..b93099eb 100644 --- a/modules/pam_xauth/Makefile.am +++ b/modules/pam_xauth/Makefile.am @@ -15,7 +15,7 @@ AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include AM_LDFLAGS = -no-undefined -avoid-version -module \ -L$(top_builddir)/libpam -lpam if HAVE_VERSIONING - AM_LDFLAGS += -Wl,--version-script=../modules.map + AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map endif securelib_LTLIBRARIES = pam_xauth.la -- cgit v1.2.3