Merge changes from CUPS 1.6svn-r9939.

[thirdparty/cups.git] / conf / Makefile

diff --git a/conf/Makefile b/conf/Makefile
index 4bb31c9ed6bed4c79e34627373b60e196312c94f..5114174f159452786a7ca5e21e2c8a553549aec9 100644 (file)
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -1,9 +1,9 @@
 #
-# "$Id: Makefile 6649 2007-07-11 21:46:42Z mike $"
+# "$Id: Makefile 7938 2008-09-11 23:53:59Z mike $"
 #
-#   Configuration file makefile for the Common UNIX Printing System (CUPS).
+#   Configuration file makefile for CUPS.
 #
-#   Copyright 2007-2008 by Apple Inc.
+#   Copyright 2007-2011 by Apple Inc.
 #   Copyright 1993-2006 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -37,6 +37,13 @@ all:
 libs:
 
 
+#
+# Make unit tests...
+#
+
+unittests:
+
+
 #
 # Clean all config and object files...
 #
@@ -63,18 +70,14 @@ 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 ; \
        done
-       $(INSTALL_CONFIG) cupsd.conf $(SERVERROOT)/cupsd.conf.default
-       -chgrp $(CUPS_GROUP) $(SERVERROOT)/cupsd.conf.default
+       $(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 \
@@ -87,7 +90,7 @@ install-data:
        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 ; \
@@ -136,5 +139,5 @@ uninstall:
 
 
 #
-# End of "$Id: Makefile 6649 2007-07-11 21:46:42Z mike $".
+# End of "$Id: Makefile 7938 2008-09-11 23:53:59Z mike $".
 #