Merge changes from 1.4svn-r7067.

[thirdparty/cups.git] / Makefile

diff --git a/Makefile b/Makefile
index 1edbe7939a3ee58ff9d2637b938304ca031e44a1..2c72a464f0c762ca90672e0759d529a2eabfde09 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,25 +1,16 @@
 #
-# "$Id: Makefile 6513 2007-05-06 23:50:25Z mike $"
+# "$Id: Makefile 6897 2007-08-30 06:11:59Z mike $"
 #
 #   Top-level Makefile for the Common UNIX Printing System (CUPS).
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636-3142 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 include Makedefs
@@ -31,7 +22,7 @@ include Makedefs
 DIRS   =       cups backend berkeley cgi-bin filter locale man monitor \
                notifier $(PDFTOPS) scheduler systemv test \
                $(PHPDIR) \
-               conf data doc fonts ppd templates
+               conf data doc $(FONTS) ppd templates
 
 
 #
@@ -72,9 +63,8 @@ distclean:    clean
        $(RM) man/cups-lpd.man man/cupsaddsmb.man man/cupsd.man
        $(RM) man/cupsd.conf.man man/lpoptions.man
        $(RM) packaging/cups.list
-       $(RM) templates/edit-config.tmpl templates/header.tmpl
+       $(RM) templates/header.tmpl
        -$(RM) doc/*/index.html
-       -$(RM) templates/*/edit-config.tmpl
        -$(RM) templates/*/header.tmpl
        -$(RM) -r autom4te*.cache
 
@@ -128,13 +118,7 @@ install:   installhdrs
        fi
        if test "x$(INITDIR)" = x -a "x$(INITDDIR)" != x; then \
                $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \
-               if test "$(INITDDIR)" = "/System/Library/StartupItems/PrintingServices"; then \
-                       echo Installing StartupItems files...; \
-                       $(INSTALL_SCRIPT) init/PrintingServices $(BUILDROOT)$(INITDDIR)/PrintingServices; \
-                       $(INSTALL_DATA) init/StartupParameters.plist $(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \
-                       $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \
-                       $(INSTALL_DATA) init/Localizable.strings $(BUILDROOT)$(INITDDIR)/Resources/English.lproj/Localizable.strings; \
-               elif test "$(INITDDIR)" = "/System/Library/LaunchDaemons"; then \
+               if test "$(INITDDIR)" = "/System/Library/LaunchDaemons"; then \
                        echo Installing LaunchDaemons configuration files...; \
                        $(INSTALL_DATA) init/org.cups.cupsd.plist $(BUILDROOT)$(DEFAULT_LAUNCHD_CONF); \
                        $(INSTALL_DATA) init/org.cups.cups-lpd.plist $(BUILDROOT)/System/Library/LaunchDaemons; \
@@ -291,5 +275,5 @@ dist:       all
 
 
 #
-# End of "$Id: Makefile 6513 2007-05-06 23:50:25Z mike $".
+# End of "$Id: Makefile 6897 2007-08-30 06:11:59Z mike $".
 #