diff options
| author | Stefan Walter <stefw@src.gnome.org> | 2007-07-30 16:46:32 +0000 |
|---|---|---|
| committer | Stefan Walter <stefw@src.gnome.org> | 2007-07-30 16:46:32 +0000 |
| commit | 95d9907c7a138446e4892b82d330cc9937e2615d (patch) | |
| tree | baaf1334709a6a01016958ce4a9e340baed721f1 | |
| parent | a4f9ade560640ff5301d7c853d4bc98211ab925d (diff) | |
| download | gnome-keyring-95d9907c7a138446e4892b82d330cc9937e2615d.tar.gz | |
Better installing of PAM module. Patch from Matthias Clasen. See bug
* pam/Makefile.am:
* configure.in: Better installing of PAM module.
Patch from Matthias Clasen. See bug #461045
svn path=/trunk/; revision=738
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | pam/Makefile.am | 7 |
3 files changed, 14 insertions, 5 deletions
@@ -1,5 +1,11 @@ 2007-07-27 Stef Walter <stef@memberwebs.com> + * pam/Makefile.am: + * configure.in: Better installing of PAM module. + Patch from Matthias Clasen. See bug #461045 + +2007-07-27 Stef Walter <stef@memberwebs.com> + * common/gkr-location.c: * library/gnome-keyring-memory.c: Build fixes from Jens Granseuer. Fixes bug #461025 diff --git a/configure.in b/configure.in index c7263641..0fda377c 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ AC_INIT(library/gnome-keyring.h) -AM_INIT_AUTOMAKE(gnome-keyring, 2.19.90) +AM_INIT_AUTOMAKE(gnome-keyring, 2.19.6.1) AM_CONFIG_HEADER(config.h) AM_SANITY_CHECK @@ -238,8 +238,10 @@ if test "$enable_pam" != "no"; then fi case "$host" in + *-redhat-linux-gnu) + PAM_DEST_DIR="/lib/security" + ;; *-*-linux*) - # See also <configure-flags> in pam_mount.xml. PAM_DEST_DIR="\$(prefix)/../lib/security" ;; *) diff --git a/pam/Makefile.am b/pam/Makefile.am index ebc4b5da..1899aee1 100644 --- a/pam/Makefile.am +++ b/pam/Makefile.am @@ -17,9 +17,10 @@ pam_gnome_keyring_la_LIBADD = \ pam_gnome_keyring_la_LDFLAGS = -module -avoid-version install-pam: install - cp $(DESTDIR)$(libdir)/pam_gnome_keyring.so $(PAM_DEST_DIR)/ - $(LN_S) -f pam_gnome_keyring.so $(PAM_DEST_DIR)/pam_gnome_keyring_auth.so - $(LN_S) -f pam_gnome_keyring.so $(PAM_DEST_DIR)/pam_gnome_keyring_session.so + $(mkinstalldirs) $(DESTDIR)$(PAM_DEST_DIR) + cp $(DESTDIR)$(libdir)/pam_gnome_keyring.so $(DESTDIR)$(PAM_DEST_DIR) + ( cd $(DESTDIR)$(PAM_DEST_DIR); $(LN_S) -f pam_gnome_keyring.so pam_gnome_keyring_auth.so ) + ( cd $(DESTDIR)$(PAM_DEST_DIR); $(LN_S) -f pam_gnome_keyring.so pam_gnome_keyring_session.so ) uninstall-pam: rm -f $(PAM_DEST_DIR)/pam_gnome_keyring.so |