ChangeLog:
authorMoritz Schulte <mo@g10code.com>
Sun, 17 Aug 2008 15:35:13 +0000 (15:35 +0000)
committerMoritz Schulte <mo@g10code.com>
Sun, 17 Aug 2008 15:35:13 +0000 (15:35 +0000)
2008-08-17  Moritz  <moritz@gnu.org>

* configure.ac: Be more verbose in respect to setting the PAM
module directory.

src/pam/ChangeLog:

2008-08-17  Moritz  <moritz@gnu.org>

* Makefile.am: Use CLEANFILES intead of clean-local target for
pam_poldi.so.
(uninstall-local, install-exec-local): New targets.

conf/ChangeLog:

2008-08-17  Moritz  <moritz@gnu.org>

* Makefile.am: Added several missing instances of DESTDIR. Thanks
to Joachim Breitner.

ChangeLog
conf/ChangeLog
conf/Makefile.am
configure.ac
src/pam/ChangeLog
src/pam/Makefile.am

index fc9cd1a..d482fbc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-17  Moritz  <moritz@gnu.org>
+
+       * configure.ac: Be more verbose in respect to setting the PAM
+       module directory.
+
 2008-08-08  Moritz  <moritz@gnu.org>
 
        * configure.ac: Bump version number up to 0.5-cvs.
index 3f42f28..8673666 100644 (file)
@@ -1,3 +1,8 @@
+2008-08-17  Moritz  <moritz@gnu.org>
+
+       * Makefile.am: Added several missing instances of DESTDIR. Thanks
+       to Joachim Breitner.
+
 2008-08-07  Moritz  <moritz@gnu.org>
 
        * poldi.conf.skel: New file.
index 1fd3ba4..373d70d 100644 (file)
 # 02111-1307, USA
 
 install-conf-skeleton:
-       $(INSTALL) -d $(POLDI_CONF_DIRECTORY)/localdb/keys
+       $(INSTALL) -d $(DESTDIR)$(POLDI_CONF_DIRECTORY)/localdb/keys
        install -m 644 -T $(top_srcdir)/conf/README.keys \
-         $(POLDI_CONF_DIRECTORY)/localdb/keys/README
-       if test -e $(POLDI_CONF_DIRECTORY)/localdb/users; then \
+         $(DESTDIR)$(POLDI_CONF_DIRECTORY)/localdb/keys/README
+       if test -e $(DESTDIR)$(POLDI_CONF_DIRECTORY)/localdb/users; then \
                echo "$(POLDI_CONF_DIRECTORY)/localdb/users exists, doing nothing here"; \
        else \
                install -m 644 -T $(top_srcdir)/conf/users.skel \
-                  $(POLDI_CONF_DIRECTORY)/localdb/users; \
+                  $(DESTDIR)$(POLDI_CONF_DIRECTORY)/localdb/users; \
        fi
-       if test -e $(POLDI_CONF_DIRECTORY)/poldi.conf; then \
-               echo "$(POLDI_CONF_DIRECTORY)/poldi.conf exists, doing nothing here"; \
+       if test -e $(DESTDIR)$(POLDI_CONF_DIRECTORY)/poldi.conf; then \
+               echo "$(DESTDIR)$(POLDI_CONF_DIRECTORY)/poldi.conf exists, doing nothing here"; \
        else \
                install -m 644 -T $(top_srcdir)/conf/poldi.conf.skel \
-                  $(POLDI_CONF_DIRECTORY)/poldi.conf; \
+                  $(DESTDIR)$(POLDI_CONF_DIRECTORY)/poldi.conf; \
        fi
 
 EXTRA_DIST = poldi.conf.skel users.skel README.keys
index 6bf8ebb..8237f10 100644 (file)
@@ -283,7 +283,12 @@ if test "$PAM_MODULE_DIRECTORY" = "$DEFAULT_PAM_MODULE_DIRECTORY"; then
 **
 ** Warning: using default value ($DEFAULT_PAM_MODULE_DIRECTORY) as
 **          installation directory for PAM module; this is probably not
-**          what you want.
+**          what you want. Either use the configure flag
+**
+**                      --with-pam-module-directory=DIRECTORY
+**
+**          or copy the newly built pam_poldi.so into the correct directory
+**          manually. Usually PAM modules are located in /lib/security.
 **])
 else
   AC_MSG_NOTICE([PAM module installation directory: $PAM_MODULE_DIRECTORY])
index 8fdfa9b..3400b60 100644 (file)
@@ -1,3 +1,9 @@
+2008-08-17  Moritz  <moritz@gnu.org>
+
+       * Makefile.am: Use CLEANFILES intead of clean-local target for
+       pam_poldi.so.
+       (uninstall-local, install-exec-local): New targets.
+
 2008-08-07  Moritz  <moritz@gnu.org>
 
        * pam_poldi.c (pam_sm_authenticate): Removed second call to
index 7ca0131..bcbc6c5 100644 (file)
@@ -68,7 +68,14 @@ pam_poldi.so: libpam_poldi.a $(AUTH_METHODS_LIBS) auth-support/libpam-poldi-auth
                $(LIBGCRYPT_LDFLAGS) $(LIBGCRYPT_LIBS) $(KSBA_LIBS)
 
 all-local: pam_poldi.so
-clean-local:
-       rm -rf pam_poldi.so
+
+install-exec-local:
+       $(INSTALL) -d $(DESTDIR)$(PAM_MODULE_DIRECTORY)
+       $(INSTALL) pam_poldi.so $(DESTDIR)$(PAM_MODULE_DIRECTORY)
+
+uninstall-local:
+       rm -f $(DESTDIR)$(PAM_MODULE_DIRECTORY)/pam_poldi.so
+
+CLEANFILES = pam_poldi.so
 
 # FIXME: LDFLAGS for other libs missing....