Relevant BUGIDs:

Purpose of commit: bugfixes

Commit summary:
---------------

2008-02-04  Thorsten Kukuk  <kukuk@thkukuk.de>

        * modules/pam_sepermit/Makefile.am: Install config file only
        if we build the module.

        * doc/Makefile.am: Fix build out of source directory.

        * po/POTFILES.in: Add pam_sepermit.c.

diff --git a/ChangeLog b/ChangeLog
index 8fa5b6000d2c87e24e2e0282acb3f7b8e57a08df..2ae0d8051ccbbff3f7c052e16c7d52e2178f6a43 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 3b89389957e78d8de4b53fc03b78e005559aedf8..4a300e15892d74069ca9aa7f7d4b22b95dc3ad1c 100644 (file)
--- 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 09a60a3ab8595a06bec3bcd5b350352b07001d1b..579e142f269e61441d1d8d2d67f9c17bf4309e5a 100644 (file)
--- 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 8a668f56c309ec497c05dc5015b8ee182e691365..12a2d75c7af21b600e17d383af0e8d7331f4f612 100644 (file)
--- 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