gnome-keyring/pam.patch
Matthias Clasen 6905355136 try again
2007-07-27 22:34:54 +00:00

49 lines
1.9 KiB
Diff

diff -up gnome-keyring-2.19.6/pam/Makefile.am.pam gnome-keyring-2.19.6/pam/Makefile.am
--- gnome-keyring-2.19.6/pam/Makefile.am.pam 2007-07-21 22:01:42.000000000 -0400
+++ gnome-keyring-2.19.6/pam/Makefile.am 2007-07-27 18:31:40.000000000 -0400
@@ -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)
+ pushd $(DESTDIR)$(PAM_DEST_DIR); $(LN_S) -f pam_gnome_keyring.so pam_gnome_keyring_auth.so; popd
+ pushd $(DESTDIR)$(PAM_DEST_DIR); $(LN_S) -f pam_gnome_keyring.so pam_gnome_keyring_session.so; popd
uninstall-pam:
rm -f $(PAM_DEST_DIR)/pam_gnome_keyring.so
diff -up gnome-keyring-2.19.6/configure.in.pam gnome-keyring-2.19.6/configure.in
--- gnome-keyring-2.19.6/configure.in.pam 2007-07-24 23:05:32.000000000 -0400
+++ gnome-keyring-2.19.6/configure.in 2007-07-27 18:31:52.000000000 -0400
@@ -236,18 +236,15 @@ if test "$enable_pam" != "no"; then
if test "$enable_pam" = "yes" -a "$have_pam" = "no"; then
AC_MSG_ERROR(The PAM headers are missing)
fi
-
- case "$host" in
- *-*-linux*)
- # See also <configure-flags> in pam_mount.xml.
- PAM_DEST_DIR="\$(prefix)/../lib/security"
- ;;
- *)
- PAM_DEST_DIR="/usr/lib"
- ;;
- esac
- AC_SUBST(PAM_DEST_DIR)
-fi
+fi
+
+AC_ARG_WITH([pam-dir],
+ [AC_HELP_STRING([--with-pam-dir=DIR],
+ [directory to install pam modules in])],
+ [], [with_pam_dir="/usr/lib"])
+PAM_DEST_DIR="$with_pam_dir"
+AC_SUBST(PAM_DEST_DIR)
+
AM_CONDITIONAL(WITH_PAM, test "$have_pam" = "yes")