Load cups into easysw/current.

[thirdparty/cups.git] / conf / Makefile

diff --git a/conf/Makefile b/conf/Makefile
index 68469380692feb07175f87fd6af0a44ea690ff0b..82a796509bf1562908aa8245673de7372e4ba3b9 100644 (file)
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 4972 2006-01-24 14:48:12Z mike $"
+# "$Id: Makefile 5185 2006-02-26 15:27:14Z mike $"
 #
 #   Configuration file makefile for the Common UNIX Printing System (CUPS).
 #
@@ -51,31 +51,35 @@ clean:
 #
 
 install:       all
-       $(INSTALL_DIR) $(SERVERROOT)
+       $(INSTALL_DIR) -m 755 $(SERVERROOT)
        for file in $(KEEP); do \
                if test -r $(SERVERROOT)/$$file ; then \
-                       $(INSTALL_DATA) $$file $(SERVERROOT)/$$file.N ; \
+                       $(INSTALL_CONFIG) $$file $(SERVERROOT)/$$file.N ; \
+                       chgrp $(CUPS_GROUP) $(SERVERROOT)/$$file.N || true; \
                else \
-                       $(INSTALL_DATA) $$file $(SERVERROOT) ; \
+                       $(INSTALL_CONFIG) $$file $(SERVERROOT) ; \
+                       chgrp $(CUPS_GROUP) $(SERVERROOT)/$$file || true; \
                fi ; \
        done
-       $(INSTALL_DATA) cupsd.conf $(SERVERROOT)/cupsd.conf.default
+       $(INSTALL_CONFIG) cupsd.conf $(SERVERROOT)/cupsd.conf.default
+       -chgrp $(CUPS_GROUP) $(SERVERROOT)/cupsd.conf.default
        for file in $(REPLACE); do \
                if test -r $(SERVERROOT)/$$file ; then \
                        $(MV) $(SERVERROOT)/$$file $(SERVERROOT)/$$file.O ; \
                fi ; \
-               $(INSTALL_DATA) $$file $(SERVERROOT) ; \
+               $(INSTALL_CONFIG) $$file $(SERVERROOT) ; \
+               chgrp $(CUPS_GROUP) $(SERVERROOT)/$$file || true; \
        done
-       -if test x$(PAMDIR) != x$(BUILDROOT); then \
-               $(INSTALL_DIR) $(PAMDIR); \
-               if test -r $(PAMDIR)/cups/$(PAMFILE) ; then \
-                       $(INSTALL_DATA) $(PAMFILE) $(PAMDIR)/cups.N ; \
+       -if test x$(PAMDIR) != x; then \
+               $(INSTALL_DIR) -m 755 $(BUILDROOT)$(PAMDIR); \
+               if test -r $(BUILDROOT)$(PAMDIR)/cups/$(PAMFILE) ; then \
+                       $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.N ; \
                else \
-                       $(INSTALL_DATA) $(PAMFILE) $(PAMDIR)/cups ; \
+                       $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups ; \
                fi ; \
        fi
 
 
 #
-# End of "$Id: Makefile 4972 2006-01-24 14:48:12Z mike $".
+# End of "$Id: Makefile 5185 2006-02-26 15:27:14Z mike $".
 #