diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | doc/Makefile.am | 2 | ||||
| -rw-r--r-- | modules/pam_sepermit/Makefile.am | 8 | ||||
| -rw-r--r-- | po/POTFILES.in | 1 |
4 files changed, 12 insertions, 5 deletions
@@ -2,6 +2,8 @@ * libpam/pam_static_modules.h: Add _pam_sepermit_modstruct. * modules/pam_sepermit/pam_sepermit.c: Fix typo. + * modules/pam_sepermit/Makefile.am: Install config file only + if we build the module. * README: Add --disable-pie to configure options for static library. @@ -11,6 +13,10 @@ * modules/Makefile.am: Add pam_sepermit. + * doc/Makefile.am: Fix build out of source directory. + + * po/POTFILES.in: Add pam_sepermit.c. + 2008-02-01 Tomas Mraz <t8m@centrum.cz> * modules/pam_namespace/namespace.conf.5.xml: Add documentation for diff --git a/doc/Makefile.am b/doc/Makefile.am index 3b893899..4a300e15 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -14,7 +14,7 @@ releasedocs: all $(mkinstalldirs) $(top_builddir)/Linux-PAM-$(VERSION)/doc/specs cp -av specs/draft-morgan-pam-current.txt \ $(top_builddir)/Linux-PAM-$(VERSION)/doc/specs/ - cp -av specs/rfc86.0.txt \ + cp -av $(srcdir)/specs/rfc86.0.txt \ $(top_builddir)/Linux-PAM-$(VERSION)/doc/specs/ make -C sag releasedocs make -C adg releasedocs diff --git a/modules/pam_sepermit/Makefile.am b/modules/pam_sepermit/Makefile.am index 09a60a3a..579e142f 100644 --- a/modules/pam_sepermit/Makefile.am +++ b/modules/pam_sepermit/Makefile.am @@ -17,7 +17,7 @@ XMLS = README.xml pam_sepermit.8.xml securelibdir = $(SECUREDIR) secureconfdir = $(SCONFIGDIR) -sepermitlockdir = /var/run/sepermit +sepermitlockdir = ${localstatedir}/run/sepermit AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \ -I$(top_srcdir)/libpam_misc/include \ @@ -30,10 +30,10 @@ if HAVE_VERSIONING pam_sepermit_la_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map endif -secureconf_DATA = sepermit.conf -sepermitlock_DATA = - if HAVE_LIBSELINUX + secureconf_DATA = sepermit.conf + sepermitlock_DATA = + securelib_LTLIBRARIES = pam_sepermit.la endif if ENABLE_REGENERATE_MAN diff --git a/po/POTFILES.in b/po/POTFILES.in index 8a668f56..12a2d75c 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -64,6 +64,7 @@ ./modules/pam_securetty/pam_securetty.c ./modules/pam_selinux/pam_selinux.c ./modules/pam_selinux/pam_selinux_check.c +./modules/pam_sepermit/pam_sepermit.c ./modules/pam_shells/pam_shells.c ./modules/pam_stress/pam_stress.c ./modules/pam_succeed_if/pam_succeed_if.c |