"make install" no longer overwrites an existing PAM configuration

file (STR #1064)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@4664 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/CHANGES.txt b/CHANGES.txt
index 92d4c42620489b0cd00acf88ff0a90cfe8712d17..a28a6633d635c3a1a1763d920d3984d79b297827 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,8 @@ CHANGES.txt - 09/17/2005
 
 CHANGES IN CUPS V1.2.0b1
 
+       - "make install" no longer overwrites an existing PAM
+         configuration file (STR #1064)
        - The scheduler now closes all files on startup when run
          in daemon mode (STR #1009)
        - Added a new RGBW colorspace to the CUPS raster format

diff --git a/conf/Makefile b/conf/Makefile
index 7fcbef95117d3298fdb904284ddabeb710e6a1aa..255fbb8e02f1f889ff357cdb11b1245511a5099e 100644 (file)
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -67,7 +67,11 @@ install:
        done
        -if test x$(PAMDIR) != x$(BUILDROOT); then \
                $(INSTALL_DIR) $(PAMDIR); \
-               $(INSTALL_DATA) $(PAMFILE) $(PAMDIR)/cups; \
+               if test -r $(PAMDIR)/cups/$(PAMFILE) ; then \
+                       $(INSTALL_DATA) $(PAMFILE) $(PAMDIR)/cups.N ; \
+               else \
+                       $(INSTALL_DATA) $(PAMFILE) $(PAMDIR)/cups ; \
+               fi ; \
        fi