Load cups into easysw/current.

[thirdparty/cups.git] / Makefile

diff --git a/Makefile b/Makefile
index 2913b9831634570d51459b65041e4f2389791dac..8393bf217a925bb202effcee264dc19b7fee6e06 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 5229 2006-03-05 16:48:12Z mike $"
+# "$Id: Makefile 5314 2006-03-20 19:06:50Z mike $"
 #
 #   Top-level Makefile for the Common UNIX Printing System (CUPS).
 #
@@ -29,7 +29,7 @@ include Makedefs
 #
 
 DIRS   =       cups backend berkeley cgi-bin filter locale man monitor \
-               notifier pdftops scheduler systemv test \
+               notifier $(PDFTOPS) scheduler systemv test \
                $(PHPDIR) \
                conf data doc fonts ppd templates
 
@@ -81,7 +81,7 @@ install:      installhdrs
        $(INSTALL_DIR) -m 755 $(BINDIR)
        $(INSTALL_SCRIPT) cups-config $(BINDIR)/cups-config
        echo Installing startup script...
-       if test "x$(INITDIR)" != "x"; then \
+       if test "x$(INITDIR)" != x; then \
                $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \
                $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \
                $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc0.d; \
@@ -93,7 +93,7 @@ install:      installhdrs
                $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc5.d; \
                $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc5.d/S99cups; \
        fi
-       if test "x$(INITDIR)" = "x" -a "x$(INITDDIR)" != "x"; then \
+       if test "x$(INITDIR)" = x -a "x$(INITDDIR)" != x; then \
                $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \
                if test "$(INITDDIR)" = "/System/Library/StartupItems/PrintingServices"; then \
                        $(INSTALL_SCRIPT) init/PrintingServices $(BUILDROOT)$(INITDDIR)/PrintingServices; \
@@ -106,11 +106,29 @@ install:  installhdrs
                        $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDDIR)/cups; \
                fi \
        fi
-       if test "x$(DBUSDIR)" != "x"; then \
+       if test "x$(DBUSDIR)" != x; then \
                echo Installing cups.conf in $(DBUSDIR)...;\
                $(INSTALL_DIR) -m 755 $(BUILDROOT)$(DBUSDIR); \
                $(INSTALL_DATA) packaging/cups-dbus.conf $(BUILDROOT)$(DBUSDIR)/cups.conf; \
        fi
+       if test "x$(XINETD)" != x; then \
+               echo Installing xinetd configuration file for cups-lpd...; \
+               $(INSTALL_DIR) -m 755 $(BUILDROOT)$(XINETD); \
+               $(INSTALL_DATA) init/cups-lpd $(BUILDROOT)$(XINETD)/cups-lpd; \
+       fi
+       if test -d /usr/share/applications; then \
+               echo Installing desktop icons...; \
+               $(INSTALL_DIR) -m 755 $(BUILDROOT)/usr/share/applications; \
+               $(INSTALL_DATA) desktop/cups.desktop $(BUILDROOT)/usr/share/applications; \
+               $(INSTALL_DIR) -m 755 $(BUILDROOT)/usr/share/icons/hicolor/16x16/apps; \
+               $(INSTALL_DATA) desktop/cups-16.png $(BUILDROOT)/usr/share/icons/hicolor/16x16/apps/cups.png; \
+               $(INSTALL_DIR) -m 755 $(BUILDROOT)/usr/share/icons/hicolor/32x32/apps; \
+               $(INSTALL_DATA) desktop/cups-32.png $(BUILDROOT)/usr/share/icons/hicolor/32x32/apps/cups.png; \
+               $(INSTALL_DIR) -m 755 $(BUILDROOT)/usr/share/icons/hicolor/64x64/apps; \
+               $(INSTALL_DATA) desktop/cups-64.png $(BUILDROOT)/usr/share/icons/hicolor/64x64/apps/cups.png; \
+               $(INSTALL_DIR) -m 755 $(BUILDROOT)/usr/share/icons/hicolor/128x128/apps; \
+               $(INSTALL_DATA) desktop/cups-128.png $(BUILDROOT)/usr/share/icons/hicolor/128x128/apps/cups.png; \
+       fi
 
 
 #
@@ -138,7 +156,7 @@ uninstall:
        $(RM) $(BINDIR)/cups-config
        -$(RMDIR) $(BINDIR)
        echo Uninstalling startup script...
-       if test "x$(INITDIR)" != "x"; then \
+       if test "x$(INITDIR)" != x; then \
                $(RM) $(BUILDROOT)$(INITDIR)/init.d/cups; \
                $(RMDIR) $(BUILDROOT)$(INITDIR)/init.d; \
                $(RM)  $(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \
@@ -150,7 +168,7 @@ uninstall:
                $(RM) $(BUILDROOT)$(INITDIR)/rc5.d/S99cups; \
                $(RMDIR) $(BUILDROOT)$(INITDIR)/rc5.d; \
        fi
-       if test "x$(INITDIR)" = "x" -a "x$(INITDDIR)" != "x"; then \
+       if test "x$(INITDIR)" = x -a "x$(INITDDIR)" != x; then \
                if test "$(INITDDIR)" = "/System/Library/StartupItems/PrintingServices"; then \
                        $(RM) $(BUILDROOT)$(INITDDIR)/PrintingServices; \
                        $(RM) $(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \
@@ -163,11 +181,17 @@ uninstall:
                fi \
                $(RMDIR) $(BUILDROOT)$(INITDDIR); \
        fi
-       if test "x$(DBUSDIR)" != "x"; then \
+       if test "x$(DBUSDIR)" != x; then \
                echo Uninstalling cups.conf in $(DBUSDIR)...;\
                $(RM) $(BUILDROOT)$(DBUSDIR)/cups.conf; \
                $(RMDIR) $(BUILDROOT)$(DBUSDIR); \
        fi
+       $(RM) $(BUILDROOT)/etc/xinetd.d/cups-lpd
+       $(RM) $(BUILDROOT)/usr/share/applications/cups.desktop
+       $(RM) $(BUILDROOT)/usr/share/icons/hicolor/16x16/apps/cups.png
+       $(RM) $(BUILDROOT)/usr/share/icons/hicolor/32x32/apps/cups.png
+       $(RM) $(BUILDROOT)/usr/share/icons/hicolor/64x64/apps/cups.png
+       $(RM) $(BUILDROOT)/usr/share/icons/hicolor/128x128/apps/cups.png
 
 
 #
@@ -193,5 +217,5 @@ epm:
 
 
 #
-# End of "$Id: Makefile 5229 2006-03-05 16:48:12Z mike $".
+# End of "$Id: Makefile 5314 2006-03-20 19:06:50Z mike $".
 #