diff options
author | jlovell <jlovell@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2006-01-27 21:43:41 +0000 |
---|---|---|
committer | jlovell <jlovell@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2006-01-27 21:43:41 +0000 |
commit | 09ec001812911f8890dad0f164ab9098e22208cf (patch) | |
tree | 891df32ed58c171f3de9fdd2effcaebf1b9f4563 /conf | |
parent | 923edb689de0b445144f1d57c491c23e6e6f9026 (diff) | |
download | cups-09ec001812911f8890dad0f164ab9098e22208cf.tar.gz |
Load cups into easysw/current.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@35 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'conf')
-rw-r--r-- | conf/Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/conf/Makefile b/conf/Makefile index 684693806..cf2f88a8a 100644 --- a/conf/Makefile +++ b/conf/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 4972 2006-01-24 14:48:12Z mike $" +# "$Id: Makefile 5008 2006-01-27 19:30:34Z mike $" # # Configuration file makefile for the Common UNIX Printing System (CUPS). # @@ -54,17 +54,17 @@ install: all $(INSTALL_DIR) $(SERVERROOT) for file in $(KEEP); do \ if test -r $(SERVERROOT)/$$file ; then \ - $(INSTALL_DATA) $$file $(SERVERROOT)/$$file.N ; \ + $(INSTALL_CONFIG) $$file $(SERVERROOT)/$$file.N ; \ else \ - $(INSTALL_DATA) $$file $(SERVERROOT) ; \ + $(INSTALL_CONFIG) $$file $(SERVERROOT) ; \ fi ; \ done - $(INSTALL_DATA) cupsd.conf $(SERVERROOT)/cupsd.conf.default + $(INSTALL_CONFIG) cupsd.conf $(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) ; \ done -if test x$(PAMDIR) != x$(BUILDROOT); then \ $(INSTALL_DIR) $(PAMDIR); \ @@ -77,5 +77,5 @@ install: all # -# End of "$Id: Makefile 4972 2006-01-24 14:48:12Z mike $". +# End of "$Id: Makefile 5008 2006-01-27 19:30:34Z mike $". # |