diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2009-04-22 17:28:12 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2009-04-22 17:28:12 +0000 |
| commit | e07d4801f9846b9155d4c63872f51b18d8537d01 (patch) | |
| tree | 5d86f7517a23788405e78b36d0a91c6898d3390d /conf | |
| parent | 38e73f87814ea3029636fb1850b0483884b3cbbe (diff) | |
| download | cups-e07d4801f9846b9155d4c63872f51b18d8537d01.tar.gz | |
Merge changes from CUPS 1.4svn-r8540.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1432 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/Makefile | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/conf/Makefile b/conf/Makefile index e9ef1f489..e8cdbfc10 100644 --- a/conf/Makefile +++ b/conf/Makefile @@ -72,15 +72,12 @@ install: all install-data install-headers install-libs install-exec install-data: 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 \ |