summaryrefslogtreecommitdiff
path: root/conf/Makefile
diff options
context:
space:
mode:
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2008-09-17 19:54:07 +0000
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2008-09-17 19:54:07 +0000
commitb19ccc9e271691cc71a08e9968c58f464ebeade5 (patch)
tree222499e15a781dcecfe0681b23825003d78caa8b /conf/Makefile
parent49d8745278805ede5c41bae3c299e14ba40457bf (diff)
downloadcups-b19ccc9e271691cc71a08e9968c58f464ebeade5.tar.gz
Merge changes from CUPS 1.4svn-r7961.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@969 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'conf/Makefile')
-rw-r--r--conf/Makefile5
1 files changed, 2 insertions, 3 deletions
diff --git a/conf/Makefile b/conf/Makefile
index acd7eacba..e9ef1f489 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -1,5 +1,5 @@
#
-# "$Id: Makefile 7670 2008-06-17 22:42:08Z mike $"
+# "$Id: Makefile 7938 2008-09-11 23:53:59Z mike $"
#
# Configuration file makefile for the Common UNIX Printing System (CUPS).
#
@@ -70,7 +70,6 @@ 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 ; \
@@ -143,5 +142,5 @@ uninstall:
#
-# End of "$Id: Makefile 7670 2008-06-17 22:42:08Z mike $".
+# End of "$Id: Makefile 7938 2008-09-11 23:53:59Z mike $".
#