* FIX: Don't overwrite PAM file if --enable-overwrite configure option is

       not set. [Sam Noble]

diff --git a/NEWS b/NEWS
index 2ed40481ae905093c189987926d1553c07b4e024..256898a69beb1f3ec7d421b431dd780a00719f8a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,8 @@ Changes in 1.6.4
   Rittau]
 * FIX: megatron: Fixed an uninitialized variable. [Olaf Hering]
 * FIX: Compilation issues. [Olaf Hering, Sebastian Rittau]
+* FIX: Don't overwrite PAM file if --enable-overwrite configure option is
+       not set. [Sam Noble]
 
 Changes in 1.6.3
 ================

diff --git a/config/Makefile.am b/config/Makefile.am
index c12cc92d03095855db951766087123d56bc0fc9a..9035855fe841f9ec9199b10a97b331b8f8dc75a0 100644 (file)
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -51,9 +51,13 @@ pamdir = @PAMDIR@/etc/pam.d
 
 install-data-local: install-config-files $(PAMFILES)
        $(mkinstalldirs) $(DESTDIR)$(pamdir)
-       for f in $(PAMFILES); do                                        \
-               $(INSTALL_DATA) $$f $(DESTDIR)$(pamdir)/netatalk || echo "WARNING: Can't install PAM files";            \
-       done
+       if test "x$(OVERWRITE_CONFIG)" = "xyes" -o ! -f $(DESTDIR)$(pamdir)/netatalk; then \
+               echo "$(INSTALL_DATA) $$f $(DESTDIR)$(pamdir)/netatalk"; \
+               $(INSTALL_DATA) netatalk.pamd $(DESTDIR)$(pamdir)/netatalk || echo
+               +"WARNING: Can't install PAM file";            \
+       else \
+               echo "not overwriting $(DESTDIR)$(pamdir)/netatalk"; \
+       fi;
 
 else