Merge changes from CUPS 1.4svn-r7874.

[thirdparty/cups.git] / conf / Makefile

diff --git a/conf/Makefile b/conf/Makefile
index af0ddbb5afdf80614073aa6dadcfc2951ddbecbe..acd7eacbabd05aa0dd48b402e9a64a12c4daa967 100644 (file)
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -1,25 +1,16 @@
 #
-# "$Id$"
+# "$Id: Makefile 7670 2008-06-17 22:42:08Z mike $"
 #
 #   Configuration file makefile for the Common UNIX Printing System (CUPS).
 #
+#   Copyright 2007-2008 by Apple Inc.
 #   Copyright 1993-2006 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products 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 missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   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/".
 #
 
 include ../Makedefs
@@ -28,7 +19,7 @@ include ../Makedefs
 # Config files...
 #
 
-KEEP   =       cupsd.conf
+KEEP   =       cupsd.conf snmp.conf
 REPLACE        =       mime.convs mime.types
 
 
@@ -39,6 +30,20 @@ REPLACE      =       mime.convs mime.types
 all:
 
 
+#
+# Make library targets...
+#
+
+libs:
+
+
+#
+# Make unit tests...
+#
+
+unittests:
+
+
 #
 # Clean all config and object files...
 #
@@ -54,10 +59,17 @@ depend:
 
 
 #
-# Install files...
+# Install all targets...
 #
 
-install:       all
+install:       all install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+install-data:
        $(INSTALL_DIR) -m 755 $(SERVERROOT)
        for file in $(KEEP); do \
                if test -r $(SERVERROOT)/$$file ; then \
@@ -70,11 +82,15 @@ install:    all
        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); \
@@ -86,6 +102,27 @@ install:    all
        fi
 
 
+#
+# Install programs...
+#
+
+install-exec:
+
+
+#
+# Install headers...
+#
+
+install-headers:
+
+
+#
+# Install libraries...
+#
+
+install-libs:
+
+
 #
 # Uninstall files...
 #
@@ -95,6 +132,10 @@ 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); \
@@ -102,5 +143,5 @@ uninstall:
 
 
 #
-# End of "$Id$".
+# End of "$Id: Makefile 7670 2008-06-17 22:42:08Z mike $".
 #