76bcd89
--- cups-1.2svn-r5238/Makefile.noinit	2006-03-07 09:37:02.000000000 +0000
76bcd89
+++ cups-1.2svn-r5238/Makefile	2006-03-07 09:42:51.000000000 +0000
76bcd89
@@ -1,4 +1,4 @@
76bcd89
-#
76bcd89
+
76bcd89
 # "$Id: Makefile 5229 2006-03-05 16:48:12Z mike $"
76bcd89
 #
76bcd89
 #   Top-level Makefile for the Common UNIX Printing System (CUPS).
76bcd89
@@ -80,32 +80,6 @@
cvsdist 99ecd13
 	echo Installing cups-config script...
76bcd89
 	$(INSTALL_DIR) -m 755 $(BINDIR)
cvsdist 99ecd13
 	$(INSTALL_SCRIPT) cups-config $(BINDIR)/cups-config
cvsdist 99ecd13
-	echo Installing startup script...
cvsdist 99ecd13
-	if test "x$(INITDIR)" != "x"; then \
76bcd89
-		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \
76bcd89
-		$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \
76bcd89
-		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc0.d; \
76bcd89
-		$(INSTALL_SCRIPT) init/cups.sh  $(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \
76bcd89
-		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc2.d; \
76bcd89
-		$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc2.d/S99cups; \
76bcd89
-		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc3.d; \
76bcd89
-		$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc3.d/S99cups; \
76bcd89
-		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc5.d; \
76bcd89
-		$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc5.d/S99cups; \
cvsdist 99ecd13
-	fi
cvsdist 99ecd13
-	if test "x$(INITDIR)" = "x" -a "x$(INITDDIR)" != "x"; then \
cvsdist 99ecd13
-		$(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \
cvsdist 99ecd13
-		if test "$(INITDDIR)" = "/System/Library/StartupItems/PrintingServices"; then \
76bcd89
-			$(INSTALL_SCRIPT) init/PrintingServices $(BUILDROOT)$(INITDDIR)/PrintingServices; \
76bcd89
-			$(INSTALL_DATA) init/StartupParameters.plist $(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \
76bcd89
-			$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \
76bcd89
-			$(INSTALL_DATA) init/Localizable.strings $(BUILDROOT)$(INITDDIR)/Resources/English.lproj/Localizable.strings; \
76bcd89
-		elif test "$(INITDDIR)" = "/System/Library/LaunchDaemons"; then \
76bcd89
-			$(INSTALL_DATA) init/org.cups.cupsd.plist $(BUILDROOT)$(DEFAULT_LAUNCHD_CONF); \
cvsdist 99ecd13
-		else \
76bcd89
-			$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDDIR)/cups; \
cvsdist 99ecd13
-		fi \
cvsdist 99ecd13
-	fi
76bcd89
 	if test "x$(DBUSDIR)" != "x"; then \
76bcd89
 		echo Installing cups.conf in $(DBUSDIR)...;\
76bcd89
 		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(DBUSDIR); \