Install filename.default versions of cups-files.conf and snmp.conf

(<rdar://problem/19024491>)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12533 a1ca3aef-8c08-0410-bb20-df032aa958be

diff --git a/CHANGES.txt b/CHANGES.txt
index 48b3ee334c05fc880b7a6cebac38e8b991ea51b2..09a1e6f4c9d9b90593b2e113a08db1666e7994ae 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,4 @@
-CHANGES.txt - 2.1b1 - 2015-02-11
+CHANGES.txt - 2.1b1 - 2015-02-27
 --------------------------------
 
 CHANGES IN CUPS V2.1b1
@@ -22,3 +22,5 @@ CHANGES IN CUPS V2.1b1
          web interface or printer sharing are enabled
          (<rdar://problem/9136448>)
        - Added a PPD generator for IPP Everywhere printers (STR #4258)
+       - Now install "default" versions of more configuration files
+         (<rdar://problem/19024491>)

diff --git a/conf/Makefile b/conf/Makefile
index 97df33f04769d905c0802300fee1c01f4dbdacf7..c6ff49c0a6887b55e2aee5024a16f524349f00bc 100644 (file)
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -3,7 +3,7 @@
 #
 #   Configuration file makefile for CUPS.
 #
-#   Copyright 2007-2012 by Apple Inc.
+#   Copyright 2007-2015 by Apple Inc.
 #   Copyright 1993-2006 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -76,8 +76,8 @@ install-data:
                else \
                        $(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
                fi ; \
+               $(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.default; \
        done
-       $(INSTALL_CONFIG) -g $(CUPS_GROUP) cupsd.conf $(SERVERROOT)/cupsd.conf.default
        $(INSTALL_DIR) -m 755 $(DATADIR)/mime
        for file in $(REPLACE); do \
                if test -r $(DATADIR)/mime/$$file ; then \