License change: Apache License, Version 2.0.

[thirdparty/cups.git] / conf / Makefile

diff --git a/conf/Makefile b/conf/Makefile
index 90ab0cd543bae232e49d6da31ce162ccd235199b..e249e6069271da0ebae62d17e6016346289b3805 100644 (file)
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -1,16 +1,10 @@
 #
-# "$Id: Makefile 6649 2007-07-11 21:46:42Z mike $"
+# Configuration file makefile for CUPS.
 #
-#   Configuration file makefile for the Common UNIX Printing System (CUPS).
+# Copyright 2007-2015 by Apple Inc.
+# Copyright 1993-2006 by Easy Software Products.
 #
-#   Copyright 2007-2008 by Apple Inc.
-#   Copyright 1993-2006 by Easy Software Products.
-#
-#   These coded instructions, statements, and computer programs are the
-#   property of Apple Inc. and are protected by Federal copyright
-#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-#   which should have been included with this file.  If this file is
-#   file is missing or damaged, see the license at "http://www.cups.org/".
+# Licensed under Apache License v2.0.  See the file "LICENSE" for more information.
 #
 
 include ../Makedefs
@@ -19,7 +13,7 @@ include ../Makedefs
 # Config files...
 #
 
-KEEP   =       cupsd.conf snmp.conf
+KEEP   =       cups-files.conf cupsd.conf snmp.conf
 REPLACE        =       mime.convs mime.types
 
 
@@ -37,6 +31,13 @@ all:
 libs:
 
 
+#
+# Make unit tests...
+#
+
+unittests:
+
+
 #
 # Clean all config and object files...
 #
@@ -63,27 +64,27 @@ install:    all install-data install-headers install-libs install-exec
 #
 
 install-data:
-       $(INSTALL_DIR) -m 755 $(SERVERROOT)
        for file in $(KEEP); do \
                if test -r $(SERVERROOT)/$$file ; then \
-                       $(INSTALL_CONFIG) $$file $(SERVERROOT)/$$file.N ; \
-                       chgrp $(CUPS_GROUP) $(SERVERROOT)/$$file.N || true; \
+                       $(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.N ; \
                else \
-                       $(INSTALL_CONFIG) $$file $(SERVERROOT) ; \
-                       chgrp $(CUPS_GROUP) $(SERVERROOT)/$$file || true; \
+                       $(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
                fi ; \
+               $(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.default; \
        done
-       $(INSTALL_CONFIG) cupsd.conf $(SERVERROOT)/cupsd.conf.default
-       -chgrp $(CUPS_GROUP) $(SERVERROOT)/cupsd.conf.default
+       $(INSTALL_DIR) -m 755 $(DATADIR)/mime
        for file in $(REPLACE); do \
+               if test -r $(DATADIR)/mime/$$file ; then \
+                       $(MV) $(DATADIR)/mime/$$file $(DATADIR)/mime/$$file.O ; \
+               fi ; \
                if test -r $(SERVERROOT)/$$file ; then \
-                       $(MV) $(SERVERROOT)/$$file $(SERVERROOT)/$$file.O ; \
+                       $(MV) $(SERVERROOT)/$$file $(DATADIR)/mime/$$file.O ; \
                fi ; \
-               $(INSTALL_DATA) $$file $(SERVERROOT) ; \
+               $(INSTALL_DATA) $$file $(DATADIR)/mime ; \
        done
        -if test x$(PAMDIR) != x; then \
                $(INSTALL_DIR) -m 755 $(BUILDROOT)$(PAMDIR); \
-               if test -r $(BUILDROOT)$(PAMDIR)/cups/$(PAMFILE) ; then \
+               if test -r $(BUILDROOT)$(PAMDIR)/cups ; then \
                        $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.N ; \
                else \
                        $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups ; \
@@ -121,12 +122,11 @@ uninstall:
                $(RM) $(SERVERROOT)/$$file; \
        done
        -$(RMDIR) $(SERVERROOT)
+       for file in $(REPLACE); do \
+               $(RM) $(DATADIR)/mime/$$file; \
+       done
+       -$(RMDIR) $(DATADIR)/mime
        -if test x$(PAMDIR) != x; then \
                $(RM) $(BUILDROOT)$(PAMDIR)/cups; \
                $(RMDIR) $(BUILDROOT)$(PAMDIR); \
        fi
-
-
-#
-# End of "$Id: Makefile 6649 2007-07-11 21:46:42Z mike $".
-#