[packages/cups.git] / cups-DESTDIR.patch

--- cups-1.1.14/Makefile.orig	Tue Feb 12 20:05:36 2002
+++ cups-1.1.14/Makefile	Sun Feb 17 13:08:13 2002
@@ -76,32 +76,11 @@
 	echo Installing in templates...
 	(cd templates; $(MAKE) $(MFLAGS) install)
 	echo Installing cups-config script...
-	$(INSTALL_DIR) $(BINDIR)
-	$(INSTALL_SCRIPT) cups-config $(BINDIR)/cups-config
+	$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
+	$(INSTALL_SCRIPT) cups-config $(DESTDIR)$(BINDIR)/cups-config
 	echo Installing startup script...
-	if test "x$(INITDIR)" != "x"; then \
-		$(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/init.d; \
-		$(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \
-		$(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc0.d; \
-		$(INSTALL_SCRIPT) cups.sh  $(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \
-		$(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc2.d; \
-		$(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc2.d/S99cups; \
-		$(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc3.d; \
-		$(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc3.d/S99cups; \
-		$(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc5.d; \
-		$(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc5.d/S99cups; \
-	fi
-	if test "x$(INITDIR)" = "x" -a "x$(INITDDIR)" != "x"; then \
-		$(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \
-		if test "$(INITDDIR)" = "/System/Library/StartupItems/PrintingServices"; then \
-			$(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDDIR)/PrintingServices.sh; \
-			$(INSTALL_DATA) cups.plist $(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \
-			$(INSTALL_DIR) $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \
-			$(INSTALL_DATA) cups.strings $(BUILDROOT)$(INITDDIR)/Resources/English.lproj/Localizable.strings; \
-		else \
-			$(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDDIR)/cups; \
-		fi \
-	fi
+	$(INSTALL_DIR) $(DESTDIR)$(bindir)
+	$(INSTALL_SCRIPT) cups-config $(DESTDIR)$(bindir)/cups-config
 
 
 #
diff -Nur cups-1.1.12/backend/Makefile cups-1.1.12-new/backend/Makefile
--- cups-1.1.12/backend/Makefile	Tue Jul 24 21:56:41 2001
+++ cups-1.1.12-new/backend/Makefile	Sat Nov 24 20:27:51 2001
@@ -49,12 +49,11 @@
 #
 
 install:
-	$(INSTALL_DIR) $(SERVERBIN)/backend
+	$(INSTALL_DIR) $(DESTDIR)$(SERVERBIN)/backend
 	for file in $(BACKENDS); do \
-		$(INSTALL_BIN) $$file $(SERVERBIN)/backend; \
+		$(INSTALL_BIN) $$file $(DESTDIR)$(SERVERBIN)/backend; \
 	done
-	$(RM) $(SERVERBIN)/backend/http
-	$(LN) ipp $(SERVERBIN)/backend/http
+	$(LN) -sf ipp $(DESTDIR)$(SERVERBIN)/backend/http
 
 
 #
diff -Nur cups-1.1.12/berkeley/Makefile cups-1.1.12-new/berkeley/Makefile
--- cups-1.1.12/berkeley/Makefile	Thu Jul 19 22:17:51 2001
+++ cups-1.1.12-new/berkeley/Makefile	Sat Nov 24 20:27:51 2001
@@ -48,12 +48,12 @@
 #
 
 install:
-	$(INSTALL_DIR) $(BINDIR)
-	$(INSTALL_BIN) lpq $(BINDIR)
-	$(INSTALL_BIN) lpr $(BINDIR)
-	$(INSTALL_BIN) lprm $(BINDIR)
-	$(INSTALL_DIR) $(SBINDIR)
-	$(INSTALL_BIN) lpc $(SBINDIR)
+	$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
+	$(INSTALL_BIN) lpq $(DESTDIR)$(BINDIR)
+	$(INSTALL_BIN) lpr $(DESTDIR)$(BINDIR)
+	$(INSTALL_BIN) lprm $(DESTDIR)$(BINDIR)
+	$(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
+	$(INSTALL_BIN) lpc $(DESTDIR)$(SBINDIR)
 
 
 #
diff -Nur cups-1.1.12/cgi-bin/Makefile cups-1.1.12-new/cgi-bin/Makefile
--- cups-1.1.12/cgi-bin/Makefile	Thu Jul 19 22:17:51 2001
+++ cups-1.1.12-new/cgi-bin/Makefile	Sat Nov 24 20:27:51 2001
@@ -50,9 +50,9 @@
 #
 
 install:
-	$(INSTALL_DIR) $(SERVERBIN)/cgi-bin
+	$(INSTALL_DIR) $(DESTDIR)$(SERVERBIN)/cgi-bin
 	for file in $(CGIS); do \
-		$(INSTALL_BIN) $$file $(SERVERBIN)/cgi-bin; \
+		$(INSTALL_BIN) $$file $(DESTDIR)$(SERVERBIN)/cgi-bin; \
 	done
 
 
diff -Nur cups-1.1.12/conf/Makefile cups-1.1.12-new/conf/Makefile
--- cups-1.1.12/conf/Makefile	Wed Jun 27 23:53:08 2001
+++ cups-1.1.12-new/conf/Makefile	Sat Nov 24 20:27:51 2001
@@ -51,19 +51,12 @@
 #
 
 install:
-	$(INSTALL_DIR) $(SERVERROOT)
+	$(INSTALL_DIR) $(DESTDIR)$(SERVERROOT)
 	for file in $(KEEP); do \
-		if test -r $(SERVERROOT)/$$file ; then \
-			$(INSTALL_DATA) $$file $(SERVERROOT)/$$file.N ; \
-		else \
-			$(INSTALL_DATA) $$file $(SERVERROOT) ; \
-		fi ; \
+		$(INSTALL_DATA) $$file $(DESTDIR)$(SERVERROOT) ; \
 	done
 	for file in $(REPLACE); do \
-		if test -r $(SERVERROOT)/$$file ; then \
-			$(MV) $(SERVERROOT)/$$file $(SERVERROOT)/$$file.O ; \
-		fi ; \
-		$(INSTALL_DATA) $$file $(SERVERROOT) ; \
+		$(INSTALL_DATA) $$file $(DESTDIR)$(SERVERROOT) ; \
 	done
 
 
diff -Nur cups-1.1.12/cups/Makefile cups-1.1.12-new/cups/Makefile
--- cups-1.1.12/cups/Makefile	Tue Oct 30 21:37:14 2001
+++ cups-1.1.12-new/cups/Makefile	Sat Nov 24 20:32:04 2001
@@ -68,25 +68,14 @@
 #
 
 install:	all
-	$(INSTALL_DIR) $(INCLUDEDIR)/cups
+	$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/cups
 	for file in $(HEADERS); do \
-		$(INSTALL_DATA) $$file $(INCLUDEDIR)/cups; \
+		$(INSTALL_DATA) $$file $(DESTDIR)$(INCLUDEDIR)/cups; \
 	done
-	$(INSTALL_DIR) $(LIBDIR)
-	$(INSTALL_LIB) $(LIBCUPS) $(LIBDIR)
-	if test $(LIBCUPS) = "libcups.so.2" -o $(LIBCUPS) = "libcups.sl.2"; then \
-		$(INSTALL_LIB) libcups.a $(LIBDIR); \
-		$(RM) $(LIBDIR)/`basename $(LIBCUPS) .2`; \
-		$(LN) $(LIBCUPS) $(LIBDIR)/`basename $(LIBCUPS) .2`; \
-	fi
-	if test $(LIBCUPS) = "libcups.2.dylib"; then \
-		$(INSTALL_LIB) libcups.a $(LIBDIR); \
-		$(RM) $(LIBDIR)/libcups.dylib; \
-		$(LN) $(LIBCUPS) $(LIBDIR)/libcups.dylib; \
-	fi
-	if test $(LIBCUPS) = "libcups_s.a"; then \
-		$(INSTALL_LIB) libcups.a $(LIBDIR); \
-	fi
+	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
+	$(INSTALL_LIB) $(LIBCUPS) $(DESTDIR)$(LIBDIR)
+	$(LN) $(LIBCUPS) $(DESTDIR)$(LIBDIR)/`basename $(LIBCUPS) .2`
+	$(INSTALL_LIB) libcups.a $(DESTDIR)$(LIBDIR)
 
 
 #
--- cups-1.1.13/data/Makefile.orig	Thu Jan 31 15:53:42 2002
+++ cups-1.1.13/data/Makefile	Tue Feb  5 08:22:43 2002
@@ -85,27 +85,20 @@
 #
 
 install:
-	$(INSTALL_DIR) $(DATADIR)/banners
+	$(INSTALL_DIR) $(DESTDIR)$(DATADIR)/banners
 	for file in $(BANNERS); do \
-		$(INSTALL_DATA) $$file $(DATADIR)/banners; \
+		$(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/banners; \
 	done
-	$(INSTALL_DIR) $(DATADIR)/charsets
+	$(INSTALL_DIR) $(DESTDIR)$(DATADIR)/charsets
 	for file in $(CHARSETS); do \
-		$(INSTALL_DATA) $$file $(DATADIR)/charsets; \
+		$(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/charsets; \
 	done
-	$(INSTALL_DIR) $(DATADIR)/data
+	$(INSTALL_DIR) $(DESTDIR)$(DATADIR)/data
 	for file in $(DATAFILES); do \
-		$(INSTALL_DATA) $$file $(DATADIR)/data; \
+		$(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/data; \
 	done
-	-if test x$(PAMDIR) != x$(BUILDROOT); then \
-		$(INSTALL_DIR) $(PAMDIR); \
-		if test -f /lib/security/pam_unix.so; then \
-			$(INSTALL_DATA) cups.suse $(PAMDIR)/cups; \
-		else \
-			$(INSTALL_DATA) cups.pam $(PAMDIR)/cups; \
-		fi \
-	fi
-
+	$(INSTALL_DIR) $(DESTDIR)$(PAMDIR)
+	$(INSTALL_DATA) cups.pam $(DESTDIR)$(PAMDIR)/cups
 
 #
 # End of "$Id$".
diff -Nur cups-1.1.12/doc/Makefile cups-1.1.12-new/doc/Makefile
--- cups-1.1.12/doc/Makefile	Thu Jul 19 22:17:53 2001
+++ cups-1.1.12-new/doc/Makefile	Sat Nov 24 20:27:51 2001
@@ -118,21 +118,21 @@
 #
 
 install:
-	$(INSTALL_DIR) $(DOCDIR)
+	$(INSTALL_DIR) $(DESTDIR)$(DOCDIR)
 	for file in $(WEBPAGES); do \
-		$(INSTALL_MAN) $$file $(DOCDIR); \
+		$(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR); \
 	done
-	$(INSTALL_MAN) overview.html $(DOCDIR)
-	$(INSTALL_MAN) overview.pdf $(DOCDIR)
+	$(INSTALL_MAN) overview.html $(DESTDIR)$(DOCDIR)
+	$(INSTALL_MAN) overview.pdf $(DESTDIR)$(DOCDIR)
 	for file in $(DOCUMENTS:.shtml=.html); do \
-		$(INSTALL_MAN) $$file $(DOCDIR); \
+		$(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR); \
 	done
 	for file in $(DOCUMENTS:.shtml=.pdf); do \
-		$(INSTALL_MAN) $$file $(DOCDIR); \
+		$(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR); \
 	done
-	$(INSTALL_DIR) $(DOCDIR)/images
+	$(INSTALL_DIR) $(DESTDIR)$(DOCDIR)/images
 	for file in $(WEBIMAGES) $(DOCIMAGES); do \
-		$(INSTALL_MAN) $$file $(DOCDIR)/images; \
+		$(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR)/images; \
 	done
 
 
--- cups-1.1.13/filter/Makefile.orig	Wed Jan 23 23:30:42 2002
+++ cups-1.1.13/filter/Makefile	Tue Feb  5 08:25:37 2002
@@ -59,24 +59,15 @@
 #
 
 install:
-	$(INSTALL_DIR) $(SERVERBIN)/filter
+	$(INSTALL_DIR) $(DESTDIR)$(SERVERBIN)/filter
 	for file in $(TARGETS); do \
-		$(INSTALL_BIN) $$file $(SERVERBIN)/filter; \
+		$(INSTALL_BIN) $$file $(DESTDIR)$(SERVERBIN)/filter; \
 	done
-	$(INSTALL_DIR) $(LIBDIR)
-	$(INSTALL_LIB) $(LIBCUPSIMAGE) $(LIBDIR)
-	-if test $(LIBCUPSIMAGE) = "libcupsimage.so.2" -o $(LIBCUPSIMAGE) = "libcupsimage.sl.2"; then \
-		$(RM) $(LIBDIR)/`basename $(LIBCUPSIMAGE) .2`; \
-		$(LN) $(LIBCUPSIMAGE) $(LIBDIR)/`basename $(LIBCUPSIMAGE) .2`; \
-	fi
-	-if test $(LIBCUPSIMAGE) = "libcupsimage.2.dylib"; then \
-		$(RM) $(LIBDIR)/libcupsimage.dylib; \
-		$(LN) $(LIBCUPSIMAGE) $(LIBDIR)/libcupsimage.dylib; \
-	fi
-	$(INSTALL_DIR) $(INCLUDEDIR)/cups
-	$(INSTALL_DATA) image.h $(INCLUDEDIR)/cups
-	$(INSTALL_DATA) raster.h $(INCLUDEDIR)/cups
-
+	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
+	$(INSTALL_LIB) $(LIBCUPSIMAGE) $(DESTDIR)$(LIBDIR)
+	$(LN) $(LIBCUPSIMAGE) $(DESTDIR)$(LIBDIR)/`basename $(LIBCUPSIMAGE) .2`; \
+	$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/cups
+	$(INSTALL_DATA) image.h raster.h $(DESTDIR)$(INCLUDEDIR)/cups
 
 #
 # formtops
diff -Nur cups-1.1.12/fonts/Makefile cups-1.1.12-new/fonts/Makefile
--- cups-1.1.12/fonts/Makefile	Thu Jul 19 22:17:55 2001
+++ cups-1.1.12-new/fonts/Makefile	Sat Nov 24 20:27:51 2001
@@ -64,9 +64,9 @@
 #
 
 install:
-	$(INSTALL_DIR) $(DATADIR)/fonts
+	$(INSTALL_DIR) $(DESTDIR)$(DATADIR)/fonts
 	for file in $(FONTS); do \
-		$(INSTALL_DATA) $$file $(DATADIR)/fonts; \
+		$(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/fonts; \
 	done
 
 
diff -Nur cups-1.1.12/locale/Makefile cups-1.1.12-new/locale/Makefile
--- cups-1.1.12/locale/Makefile	Tue Oct 23 19:20:23 2001
+++ cups-1.1.12-new/locale/Makefile	Sat Nov 24 20:27:51 2001
@@ -50,10 +50,10 @@
 #
 
 install:
-	$(INSTALL_DIR) $(LOCALEDIR)
+	$(INSTALL_DIR) $(DESTDIR)$(LOCALEDIR)
 	for dir in $(LOCALES) ; do \
-		$(INSTALL_DIR) $(LOCALEDIR)/$$dir ; \
-		$(INSTALL_DATA) $$dir/cups_$$dir $(LOCALEDIR)/$$dir ; \
+		$(INSTALL_DIR) $(DESTDIR)$(LOCALEDIR)/$$dir ; \
+		$(INSTALL_DATA) $$dir/cups_$$dir $(DESTDIR)$(LOCALEDIR)/$$dir ; \
 	done
 
 
diff -Nur cups-1.1.12/man/Makefile cups-1.1.12-new/man/Makefile
--- cups-1.1.12/man/Makefile	Fri Oct 26 05:16:48 2001
+++ cups-1.1.12-new/man/Makefile	Sat Nov 24 20:48:12 2001
@@ -63,50 +63,25 @@
 #
 
 install:
-	$(INSTALL_DIR) $(MANDIR)/man1
+	$(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man1
 	for file in $(MAN1); do \
-		$(INSTALL_MAN) $$file $(MANDIR)/man1/`basename $$file man`1; \
+		$(INSTALL_MAN) $$file $(DESTDIR)$(MANDIR)/man1/`basename $$file man`1; \
 	done
-	$(RM) $(MANDIR)/man1/cancel.1
-	$(LN) lp.1 $(MANDIR)/man1/cancel.1
-	$(INSTALL_DIR) $(PMANDIR)/man3
+	$(INSTALL_DIR) $(DESTDIR)$(PMANDIR)/man3
 	for file in $(MAN3); do \
-		$(INSTALL_MAN) $$file $(PMANDIR)/man3/`basename $$file man`3; \
+		$(INSTALL_MAN) $$file $(DESTDIR)$(MANDIR)/man3/`basename $$file man`3; \
 	done
-	$(INSTALL_DIR) $(MANDIR)/man5
+	$(INSTALL_DIR) $(DESTDIR)$(PMANDIR)/man5
 	for file in $(MAN5); do \
-		$(INSTALL_MAN) $$file $(MANDIR)/man5/`basename $$file man`5; \
+		$(INSTALL_MAN) $$file $(DESTDIR)$(MANDIR)/man5/`basename $$file man`5; \
 	done
-	$(INSTALL_DIR) $(AMANDIR)/man$(MAN8EXT)
+	$(INSTALL_DIR) $(DESTDIR)$(PMANDIR)/man8
 	for file in $(MAN8); do \
-		$(INSTALL_MAN) $$file $(AMANDIR)/man$(MAN8EXT)/`basename $$file man`$(MAN8EXT); \
+		$(INSTALL_MAN) $$file $(DESTDIR)$(AMANDIR)/man$(MAN8EXT)/`basename $$file man`$(MAN8EXT); \
 	done
-	$(RM) $(AMANDIR)/man$(MAN8EXT)/reject.$(MAN8EXT)
-	$(LN) accept.$(MAN8EXT) $(AMANDIR)/man$(MAN8EXT)/reject.$(MAN8EXT)
-	$(RM) $(AMANDIR)/man$(MAN8EXT)/disable.$(MAN8EXT)
-	$(LN) enable.$(MAN8EXT) $(AMANDIR)/man$(MAN8EXT)/disable.$(MAN8EXT)
-	$(INSTALL_DIR) $(MANDIR)/cat1
-	for file in $(CAT1); do \
-		$(INSTALL_MAN) $$file $(MANDIR)/cat1; \
-	done
-	$(RM) $(MANDIR)/cat1/cancel.$(CAT1EXT)
-	$(LN) lp.$(CAT1EXT) $(MANDIR)/cat1/cancel.$(CAT1EXT)
-	$(INSTALL_DIR) $(PMANDIR)/cat3
-	for file in $(CAT3); do \
-		$(INSTALL_MAN) $$file $(PMANDIR)/cat3; \
-	done
-	$(INSTALL_DIR) $(MANDIR)/cat5
-	for file in $(CAT5); do \
-		$(INSTALL_MAN) $$file $(MANDIR)/cat5; \
-	done
-	$(INSTALL_DIR) $(AMANDIR)/cat$(MAN8EXT)
-	for file in $(CAT8); do \
-		$(INSTALL_MAN) $$file $(AMANDIR)/cat$(MAN8EXT); \
-	done
-	$(RM) $(AMANDIR)/cat$(MAN8EXT)/reject.$(CAT8EXT)
-	$(LN) accept.$(CAT8EXT) $(AMANDIR)/cat$(MAN8EXT)/reject.$(CAT8EXT)
-	$(RM) $(AMANDIR)/cat$(MAN8EXT)/disable.$(CAT8EXT)
-	$(LN) enable.$(CAT8EXT) $(AMANDIR)/cat$(MAN8EXT)/disable.$(CAT8EXT)
+	echo ".so accept.$(MAN8EXT)" > $(DESTDIR)$(AMANDIR)/man$(MAN8EXT)/reject.$(MAN8EXT)
+	echo ".so enable.$(MAN8EXT)" > $(DESTDIR)$(AMANDIR)/man$(MAN8EXT)/disable.$(MAN8EXT)
+
 
 
 #
diff -Nur cups-1.1.12/pdftops/Makefile cups-1.1.12-new/pdftops/Makefile
--- cups-1.1.12/pdftops/Makefile	Wed Jun 27 23:53:16 2001
+++ cups-1.1.12-new/pdftops/Makefile	Sat Nov 24 20:27:51 2001
@@ -43,8 +43,8 @@
 #
 
 install:
-	$(INSTALL_DIR) $(SERVERBIN)/filter
-	$(INSTALL_BIN) pdftops $(SERVERBIN)/filter
+	$(INSTALL_DIR) $(DESTDIR)$(SERVERBIN)/filter
+	$(INSTALL_BIN) pdftops $(DESTDIR)$(SERVERBIN)/filter
 
 
 #
diff -Nur cups-1.1.12/ppd/Makefile cups-1.1.12-new/ppd/Makefile
--- cups-1.1.12/ppd/Makefile	Thu Jul 19 22:17:56 2001
+++ cups-1.1.12-new/ppd/Makefile	Sat Nov 24 20:27:51 2001
@@ -52,9 +52,9 @@
 #
 
 install:
-	$(INSTALL_DIR) $(DATADIR)/model
+	$(INSTALL_DIR) $(DESTDIR)$(DATADIR)/model
 	for file in $(FILES); do \
-		$(INSTALL_DATA) $$file $(DATADIR)/model; \
+		$(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/model; \
 	done
 
 
diff -Nur cups-1.1.12/pstoraster/Makefile cups-1.1.12-new/pstoraster/Makefile
--- cups-1.1.12/pstoraster/Makefile	Wed Oct 31 17:18:33 2001
+++ cups-1.1.12-new/pstoraster/Makefile	Sat Nov 24 20:27:51 2001
@@ -376,11 +376,11 @@
 #
 
 install:	$(TARGETS)
-	$(INSTALL_DIR) $(SERVERBIN)/filter
-	$(INSTALL_BIN) pstoraster $(SERVERBIN)/filter
-	$(INSTALL_DIR) $(DATADIR)/pstoraster
+	$(INSTALL_DIR) $(DESTDIR)$(SERVERBIN)/filter
+	$(INSTALL_BIN) pstoraster $(DESTDIR)$(SERVERBIN)/filter
+	$(INSTALL_DIR) $(DESTDIR)$(DATADIR)/pstoraster
 	for file in $(DFILES); do \
-		$(INSTALL_DATA) $$file $(DATADIR)/pstoraster; \
+		$(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/pstoraster; \
 	done
 
 
diff -Nur cups-1.1.12/scheduler/Makefile cups-1.1.12-new/scheduler/Makefile
--- cups-1.1.12/scheduler/Makefile	Mon Jul 23 20:48:52 2001
+++ cups-1.1.12-new/scheduler/Makefile	Sat Nov 24 20:27:51 2001
@@ -52,17 +52,17 @@
 #
 
 install:
-	$(INSTALL_DIR) $(SBINDIR)
-	$(INSTALL_BIN) cupsd $(SBINDIR)
-	$(INSTALL_DIR) $(SERVERBIN)/daemon
-	$(INSTALL_BIN) cups-lpd $(SERVERBIN)/daemon
-	$(INSTALL_BIN) cups-polld $(SERVERBIN)/daemon
-	$(INSTALL_DIR) -m 711 -o $(CUPS_USER) -g $(CUPS_GROUP) $(SERVERROOT)/certs
-	$(INSTALL_DIR) $(SERVERROOT)/interfaces
-	$(INSTALL_DIR) $(SERVERROOT)/ppd
-	$(INSTALL_DIR) $(LOGDIR)
-	$(INSTALL_DIR) -m 700 -o $(CUPS_USER) -g $(CUPS_GROUP) $(REQUESTS)
-	$(INSTALL_DIR) -m 1700 -o $(CUPS_USER) -g $(CUPS_GROUP) $(REQUESTS)/tmp
+	$(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
+	$(INSTALL_BIN) cupsd $(DESTDIR)$(SBINDIR)
+	$(INSTALL_DIR) $(DESTDIR)$(SERVERBIN)/daemon
+	$(INSTALL_BIN) cups-lpd $(DESTDIR)$(SERVERBIN)/daemon
+	$(INSTALL_BIN) cups-polld $(DESTDIR)$(SERVERBIN)/daemon
+	$(INSTALL_DIR) $(DESTDIR)$(SERVERROOT)/certs
+	$(INSTALL_DIR) $(DESTDIR)$(SERVERROOT)/interfaces
+	$(INSTALL_DIR) $(DESTDIR)$(SERVERROOT)/ppd
+	$(INSTALL_DIR) $(DESTDIR)$(LOGDIR)
+	$(INSTALL_DIR) $(DESTDIR)$(REQUESTS)
+	$(INSTALL_DIR) $(DESTDIR)$(REQUESTS)/tmp
 
 
 #
diff -Nur cups-1.1.12/systemv/Makefile cups-1.1.12-new/systemv/Makefile
--- cups-1.1.12/systemv/Makefile	Tue Sep 18 21:14:47 2001
+++ cups-1.1.12-new/systemv/Makefile	Sat Nov 24 20:39:57 2001
@@ -50,23 +50,20 @@
 #
 
 install:
-	$(INSTALL_DIR) $(BINDIR)
-	$(INSTALL_BIN) accept $(SBINDIR)
-	$(RM) $(SBINDIR)/reject
-	$(LN) accept $(SBINDIR)/reject
-	$(INSTALL_BIN) cupsaddsmb $(SBINDIR)
-	$(INSTALL_BIN) lpadmin $(SBINDIR)
-	$(INSTALL_BIN) lpinfo $(SBINDIR)
-	$(INSTALL_BIN) lpmove $(SBINDIR)
-	$(INSTALL_BIN) cancel $(BINDIR)
-	$(RM) $(BINDIR)/disable
-	$(LN) ../sbin/accept $(BINDIR)/disable
-	$(RM) $(BINDIR)/enable
-	$(LN) ../sbin/accept $(BINDIR)/enable
-	$(INSTALL_BIN) lp $(BINDIR)
-	$(INSTALL_BIN) lpoptions $(BINDIR)
-	$(INSTALL_BIN) lpstat $(BINDIR)
-	$(INSTALL_BIN) -m 4755 -o $(CUPS_USER) -g $(CUPS_GROUP) lppasswd $(BINDIR)
+	$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
+	$(INSTALL_BIN) accept $(DESTDIR)$(SBINDIR)
+	$(LN) -sf accept $(DESTDIR)$(SBINDIR)/reject
+	$(INSTALL_BIN) cupsaddsmb $(DESTDIR)$(SBINDIR)
+	$(INSTALL_BIN) lpadmin $(DESTDIR)$(SBINDIR)
+	$(INSTALL_BIN) lpinfo $(DESTDIR)$(SBINDIR)
+	$(INSTALL_BIN) lpmove $(DESTDIR)$(SBINDIR)
+	$(INSTALL_BIN) cancel $(DESTDIR)$(BINDIR)
+	$(LN) -sf ../sbin/accept $(DESTDIR)$(BINDIR)/disable
+	$(LN) -sf ../sbin/accept $(DESTDIR)$(BINDIR)/enable
+	$(INSTALL_BIN) lp $(DESTDIR)$(BINDIR)
+	$(INSTALL_BIN) lpoptions $(DESTDIR)$(BINDIR)
+	$(INSTALL_BIN) lpstat $(DESTDIR)$(BINDIR)
+	$(INSTALL_BIN) lppasswd $(DESTDIR)$(BINDIR)
 
 
 #
diff -Nur cups-1.1.12/templates/Makefile cups-1.1.12-new/templates/Makefile
--- cups-1.1.12/templates/Makefile	Mon Sep 24 19:51:16 2001
+++ cups-1.1.12-new/templates/Makefile	Sat Nov 24 20:27:51 2001
@@ -92,9 +92,9 @@
 #
 
 install:
-	$(INSTALL_DIR) $(DATADIR)/templates
+	$(INSTALL_DIR) $(DESTDIR)$(DATADIR)/templates
 	for file in $(FILES); do \
-		$(INSTALL_DATA) $$file $(DATADIR)/templates; \
+		$(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/templates; \
 	done
Commit	Line	Data
5982bbaa	1	--- cups-1.1.14/Makefile.orig Tue Feb 12 20:05:36 2002
	2	+++ cups-1.1.14/Makefile Sun Feb 17 13:08:13 2002
	3	@@ -76,32 +76,11 @@
bfb43493	4	echo Installing in templates...
bfb43493	5	(cd templates; $(MAKE) $(MFLAGS) install)
fb198dce	6	echo Installing cups-config script...
23db0460	7	- $(INSTALL_DIR) $(BINDIR)
23db0460	8	- $(INSTALL_SCRIPT) cups-config $(BINDIR)/cups-config
5982bbaa	9	+ $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
	10	+ $(INSTALL_SCRIPT) cups-config $(DESTDIR)$(BINDIR)/cups-config
	11	echo Installing startup script...
bfb43493	12	- if test "x$(INITDIR)" != "x"; then \
fb198dce	13	- $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/init.d; \
	14	- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \
	15	- $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc0.d; \
	16	- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \
	17	- $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc2.d; \
	18	- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc2.d/S99cups; \
	19	- $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc3.d; \
	20	- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc3.d/S99cups; \
	21	- $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc5.d; \
	22	- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc5.d/S99cups; \
bfb43493	23	- fi
bfb43493	24	- if test "x$(INITDIR)" = "x" -a "x$(INITDDIR)" != "x"; then \
fb198dce	25	- $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \
5982bbaa	26	- if test "$(INITDDIR)" = "/System/Library/StartupItems/PrintingServices"; then \
5982bbaa	27	- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDDIR)/PrintingServices.sh; \
fb198dce	28	- $(INSTALL_DATA) cups.plist $(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \
	29	- $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \
	30	- $(INSTALL_DATA) cups.strings $(BUILDROOT)$(INITDDIR)/Resources/English.lproj/Localizable.strings; \
	31	- else \
	32	- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDDIR)/cups; \
	33	- fi \
bfb43493	34	- fi
fb198dce	35	+ $(INSTALL_DIR) $(DESTDIR)$(bindir)
	36	+ $(INSTALL_SCRIPT) cups-config $(DESTDIR)$(bindir)/cups-config
	37
5982bbaa	38
d1d5300a	39	#
fb198dce	40	diff -Nur cups-1.1.12/backend/Makefile cups-1.1.12-new/backend/Makefile
	41	--- cups-1.1.12/backend/Makefile Tue Jul 24 21:56:41 2001
	42	+++ cups-1.1.12-new/backend/Makefile Sat Nov 24 20:27:51 2001
bfb43493	43	@@ -49,12 +49,11 @@
d1d5300a	44	#
	45
	46	install:
bfb43493	47	- $(INSTALL_DIR) $(SERVERBIN)/backend
	48	+ $(INSTALL_DIR) $(DESTDIR)$(SERVERBIN)/backend
	49	for file in $(BACKENDS); do \
	50	- $(INSTALL_BIN) $$file $(SERVERBIN)/backend; \
	51	+ $(INSTALL_BIN) $$file $(DESTDIR)$(SERVERBIN)/backend; \
d1d5300a	52	done
bfb43493	53	- $(RM) $(SERVERBIN)/backend/http
	54	- $(LN) ipp $(SERVERBIN)/backend/http
	55	+ $(LN) -sf ipp $(DESTDIR)$(SERVERBIN)/backend/http
d1d5300a	56
	57
	58	#
fb198dce	59	diff -Nur cups-1.1.12/berkeley/Makefile cups-1.1.12-new/berkeley/Makefile
	60	--- cups-1.1.12/berkeley/Makefile Thu Jul 19 22:17:51 2001
	61	+++ cups-1.1.12-new/berkeley/Makefile Sat Nov 24 20:27:51 2001
bfb43493	62	@@ -48,12 +48,12 @@
d1d5300a	63	#
	64
	65	install:
bfb43493	66	- $(INSTALL_DIR) $(BINDIR)
	67	- $(INSTALL_BIN) lpq $(BINDIR)
	68	- $(INSTALL_BIN) lpr $(BINDIR)
	69	- $(INSTALL_BIN) lprm $(BINDIR)
	70	- $(INSTALL_DIR) $(SBINDIR)
	71	- $(INSTALL_BIN) lpc $(SBINDIR)
	72	+ $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
	73	+ $(INSTALL_BIN) lpq $(DESTDIR)$(BINDIR)
	74	+ $(INSTALL_BIN) lpr $(DESTDIR)$(BINDIR)
	75	+ $(INSTALL_BIN) lprm $(DESTDIR)$(BINDIR)
	76	+ $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
	77	+ $(INSTALL_BIN) lpc $(DESTDIR)$(SBINDIR)
d1d5300a	78
	79
	80	#
fb198dce	81	diff -Nur cups-1.1.12/cgi-bin/Makefile cups-1.1.12-new/cgi-bin/Makefile
	82	--- cups-1.1.12/cgi-bin/Makefile Thu Jul 19 22:17:51 2001
	83	+++ cups-1.1.12-new/cgi-bin/Makefile Sat Nov 24 20:27:51 2001
bfb43493	84	@@ -50,9 +50,9 @@
d1d5300a	85	#
	86
	87	install:
bfb43493	88	- $(INSTALL_DIR) $(SERVERBIN)/cgi-bin
	89	+ $(INSTALL_DIR) $(DESTDIR)$(SERVERBIN)/cgi-bin
	90	for file in $(CGIS); do \
	91	- $(INSTALL_BIN) $$file $(SERVERBIN)/cgi-bin; \
	92	+ $(INSTALL_BIN) $$file $(DESTDIR)$(SERVERBIN)/cgi-bin; \
	93	done
d1d5300a	94
bfb43493	95
fb198dce	96	diff -Nur cups-1.1.12/conf/Makefile cups-1.1.12-new/conf/Makefile
	97	--- cups-1.1.12/conf/Makefile Wed Jun 27 23:53:08 2001
	98	+++ cups-1.1.12-new/conf/Makefile Sat Nov 24 20:27:51 2001
d1d5300a	99	@@ -51,19 +51,12 @@
	100	#
	101
	102	install:
	103	- $(INSTALL_DIR) $(SERVERROOT)
	104	+ $(INSTALL_DIR) $(DESTDIR)$(SERVERROOT)
	105	for file in $(KEEP); do \
	106	- if test -r $(SERVERROOT)/$$file ; then \
	107	- $(INSTALL_DATA) $$file $(SERVERROOT)/$$file.N ; \
	108	- else \
	109	- $(INSTALL_DATA) $$file $(SERVERROOT) ; \
	110	- fi ; \
	111	+ $(INSTALL_DATA) $$file $(DESTDIR)$(SERVERROOT) ; \
	112	done
	113	for file in $(REPLACE); do \
	114	- if test -r $(SERVERROOT)/$$file ; then \
	115	- $(MV) $(SERVERROOT)/$$file $(SERVERROOT)/$$file.O ; \
	116	- fi ; \
	117	- $(INSTALL_DATA) $$file $(SERVERROOT) ; \
	118	+ $(INSTALL_DATA) $$file $(DESTDIR)$(SERVERROOT) ; \
	119	done
	120
	121
fb198dce	122	diff -Nur cups-1.1.12/cups/Makefile cups-1.1.12-new/cups/Makefile
	123	--- cups-1.1.12/cups/Makefile Tue Oct 30 21:37:14 2001
	124	+++ cups-1.1.12-new/cups/Makefile Sat Nov 24 20:32:04 2001
	125	@@ -68,25 +68,14 @@
d1d5300a	126	#
	127
	128	install: all
	129	- $(INSTALL_DIR) $(INCLUDEDIR)/cups
bfb43493	130	+ $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/cups
	131	for file in $(HEADERS); do \
	132	- $(INSTALL_DATA) $$file $(INCLUDEDIR)/cups; \
	133	+ $(INSTALL_DATA) $$file $(DESTDIR)$(INCLUDEDIR)/cups; \
	134	done
d1d5300a	135	- $(INSTALL_DIR) $(LIBDIR)
	136	- $(INSTALL_LIB) $(LIBCUPS) $(LIBDIR)
	137	- if test $(LIBCUPS) = "libcups.so.2" -o $(LIBCUPS) = "libcups.sl.2"; then \
bfb43493	138	- $(INSTALL_LIB) libcups.a $(LIBDIR); \
	139	- $(RM) $(LIBDIR)/`basename $(LIBCUPS) .2`; \
	140	- $(LN) $(LIBCUPS) $(LIBDIR)/`basename $(LIBCUPS) .2`; \
d1d5300a	141	- fi
fb198dce	142	- if test $(LIBCUPS) = "libcups.2.dylib"; then \
	143	- $(INSTALL_LIB) libcups.a $(LIBDIR); \
	144	- $(RM) $(LIBDIR)/libcups.dylib; \
	145	- $(LN) $(LIBCUPS) $(LIBDIR)/libcups.dylib; \
	146	- fi
bfb43493	147	- if test $(LIBCUPS) = "libcups_s.a"; then \
	148	- $(INSTALL_LIB) libcups.a $(LIBDIR); \
	149	- fi
d1d5300a	150	+ $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
d1d5300a	151	+ $(INSTALL_LIB) $(LIBCUPS) $(DESTDIR)$(LIBDIR)
ed626ea8	152	+ $(LN) $(LIBCUPS) $(DESTDIR)$(LIBDIR)/`basename $(LIBCUPS) .2`
d1d5300a	153	+ $(INSTALL_LIB) libcups.a $(DESTDIR)$(LIBDIR)
d1d5300a	154
fb198dce	155
d1d5300a	156	#
23db0460	157	--- cups-1.1.13/data/Makefile.orig Thu Jan 31 15:53:42 2002
	158	+++ cups-1.1.13/data/Makefile Tue Feb 5 08:22:43 2002
	159	@@ -85,27 +85,20 @@
d1d5300a	160	#
	161
	162	install:
bfb43493	163	- $(INSTALL_DIR) $(DATADIR)/banners
	164	+ $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/banners
	165	for file in $(BANNERS); do \
	166	- $(INSTALL_DATA) $$file $(DATADIR)/banners; \
	167	+ $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/banners; \
	168	done
	169	- $(INSTALL_DIR) $(DATADIR)/charsets
	170	+ $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/charsets
	171	for file in $(CHARSETS); do \
	172	- $(INSTALL_DATA) $$file $(DATADIR)/charsets; \
	173	+ $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/charsets; \
	174	done
	175	- $(INSTALL_DIR) $(DATADIR)/data
	176	+ $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/data
	177	for file in $(DATAFILES); do \
	178	- $(INSTALL_DATA) $$file $(DATADIR)/data; \
	179	+ $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/data; \
	180	done
23db0460	181	- -if test x$(PAMDIR) != x$(BUILDROOT); then \
bfb43493	182	- $(INSTALL_DIR) $(PAMDIR); \
	183	- if test -f /lib/security/pam_unix.so; then \
	184	- $(INSTALL_DATA) cups.suse $(PAMDIR)/cups; \
	185	- else \
	186	- $(INSTALL_DATA) cups.pam $(PAMDIR)/cups; \
	187	- fi \
	188	- fi
23db0460	189	-
bfb43493	190	+ $(INSTALL_DIR) $(DESTDIR)$(PAMDIR)
bfb43493	191	+ $(INSTALL_DATA) cups.pam $(DESTDIR)$(PAMDIR)/cups
d1d5300a	192
d1d5300a	193	#
23db0460	194	# End of "$Id$".
fb198dce	195	diff -Nur cups-1.1.12/doc/Makefile cups-1.1.12-new/doc/Makefile
	196	--- cups-1.1.12/doc/Makefile Thu Jul 19 22:17:53 2001
	197	+++ cups-1.1.12-new/doc/Makefile Sat Nov 24 20:27:51 2001
bfb43493	198	@@ -118,21 +118,21 @@
d1d5300a	199	#
	200
	201	install:
bfb43493	202	- $(INSTALL_DIR) $(DOCDIR)
	203	+ $(INSTALL_DIR) $(DESTDIR)$(DOCDIR)
	204	for file in $(WEBPAGES); do \
	205	- $(INSTALL_MAN) $$file $(DOCDIR); \
	206	+ $(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR); \
	207	done
	208	- $(INSTALL_MAN) overview.html $(DOCDIR)
	209	- $(INSTALL_MAN) overview.pdf $(DOCDIR)
	210	+ $(INSTALL_MAN) overview.html $(DESTDIR)$(DOCDIR)
	211	+ $(INSTALL_MAN) overview.pdf $(DESTDIR)$(DOCDIR)
	212	for file in $(DOCUMENTS:.shtml=.html); do \
	213	- $(INSTALL_MAN) $$file $(DOCDIR); \
	214	+ $(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR); \
	215	done
	216	for file in $(DOCUMENTS:.shtml=.pdf); do \
	217	- $(INSTALL_MAN) $$file $(DOCDIR); \
	218	+ $(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR); \
	219	done
	220	- $(INSTALL_DIR) $(DOCDIR)/images
	221	+ $(INSTALL_DIR) $(DESTDIR)$(DOCDIR)/images
	222	for file in $(WEBIMAGES) $(DOCIMAGES); do \
	223	- $(INSTALL_MAN) $$file $(DOCDIR)/images; \
	224	+ $(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR)/images; \
	225	done
d1d5300a	226
d1d5300a	227
23db0460	228	--- cups-1.1.13/filter/Makefile.orig Wed Jan 23 23:30:42 2002
	229	+++ cups-1.1.13/filter/Makefile Tue Feb 5 08:25:37 2002
	230	@@ -59,24 +59,15 @@
d1d5300a	231	#
	232
	233	install:
bfb43493	234	- $(INSTALL_DIR) $(SERVERBIN)/filter
	235	+ $(INSTALL_DIR) $(DESTDIR)$(SERVERBIN)/filter
	236	for file in $(TARGETS); do \
	237	- $(INSTALL_BIN) $$file $(SERVERBIN)/filter; \
	238	+ $(INSTALL_BIN) $$file $(DESTDIR)$(SERVERBIN)/filter; \
	239	done
d1d5300a	240	- $(INSTALL_DIR) $(LIBDIR)
d1d5300a	241	- $(INSTALL_LIB) $(LIBCUPSIMAGE) $(LIBDIR)
bfb43493	242	- -if test $(LIBCUPSIMAGE) = "libcupsimage.so.2" -o $(LIBCUPSIMAGE) = "libcupsimage.sl.2"; then \
	243	- $(RM) $(LIBDIR)/`basename $(LIBCUPSIMAGE) .2`; \
	244	- $(LN) $(LIBCUPSIMAGE) $(LIBDIR)/`basename $(LIBCUPSIMAGE) .2`; \
	245	- fi
fb198dce	246	- -if test $(LIBCUPSIMAGE) = "libcupsimage.2.dylib"; then \
	247	- $(RM) $(LIBDIR)/libcupsimage.dylib; \
	248	- $(LN) $(LIBCUPSIMAGE) $(LIBDIR)/libcupsimage.dylib; \
	249	- fi
d1d5300a	250	- $(INSTALL_DIR) $(INCLUDEDIR)/cups
23db0460	251	- $(INSTALL_DATA) image.h $(INCLUDEDIR)/cups
d1d5300a	252	- $(INSTALL_DATA) raster.h $(INCLUDEDIR)/cups
23db0460	253	-
bfb43493	254	+ $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
	255	+ $(INSTALL_LIB) $(LIBCUPSIMAGE) $(DESTDIR)$(LIBDIR)
	256	+ $(LN) $(LIBCUPSIMAGE) $(DESTDIR)$(LIBDIR)/`basename $(LIBCUPSIMAGE) .2`; \
d1d5300a	257	+ $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/cups
23db0460	258	+ $(INSTALL_DATA) image.h raster.h $(DESTDIR)$(INCLUDEDIR)/cups
fb198dce	259
d1d5300a	260	#
23db0460	261	# formtops
fb198dce	262	diff -Nur cups-1.1.12/fonts/Makefile cups-1.1.12-new/fonts/Makefile
	263	--- cups-1.1.12/fonts/Makefile Thu Jul 19 22:17:55 2001
	264	+++ cups-1.1.12-new/fonts/Makefile Sat Nov 24 20:27:51 2001
bfb43493	265	@@ -64,9 +64,9 @@
d1d5300a	266	#
	267
	268	install:
bfb43493	269	- $(INSTALL_DIR) $(DATADIR)/fonts
	270	+ $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/fonts
	271	for file in $(FONTS); do \
	272	- $(INSTALL_DATA) $$file $(DATADIR)/fonts; \
	273	+ $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/fonts; \
	274	done
d1d5300a	275
d1d5300a	276
fb198dce	277	diff -Nur cups-1.1.12/locale/Makefile cups-1.1.12-new/locale/Makefile
	278	--- cups-1.1.12/locale/Makefile Tue Oct 23 19:20:23 2001
	279	+++ cups-1.1.12-new/locale/Makefile Sat Nov 24 20:27:51 2001
d1d5300a	280	@@ -50,10 +50,10 @@
	281	#
	282
	283	install:
	284	- $(INSTALL_DIR) $(LOCALEDIR)
	285	+ $(INSTALL_DIR) $(DESTDIR)$(LOCALEDIR)
	286	for dir in $(LOCALES) ; do \
	287	- $(INSTALL_DIR) $(LOCALEDIR)/$$dir ; \
	288	- $(INSTALL_DATA) $$dir/cups_$$dir $(LOCALEDIR)/$$dir ; \
	289	+ $(INSTALL_DIR) $(DESTDIR)$(LOCALEDIR)/$$dir ; \
	290	+ $(INSTALL_DATA) $$dir/cups_$$dir $(DESTDIR)$(LOCALEDIR)/$$dir ; \
	291	done
	292
	293
fb198dce	294	diff -Nur cups-1.1.12/man/Makefile cups-1.1.12-new/man/Makefile
	295	--- cups-1.1.12/man/Makefile Fri Oct 26 05:16:48 2001
	296	+++ cups-1.1.12-new/man/Makefile Sat Nov 24 20:48:12 2001
	297	@@ -63,50 +63,25 @@
d1d5300a	298	#
	299
	300	install:
bfb43493	301	- $(INSTALL_DIR) $(MANDIR)/man1
	302	+ $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man1
	303	for file in $(MAN1); do \
	304	- $(INSTALL_MAN) $$file $(MANDIR)/man1/`basename $$file man`1; \
	305	+ $(INSTALL_MAN) $$file $(DESTDIR)$(MANDIR)/man1/`basename $$file man`1; \
	306	done
	307	- $(RM) $(MANDIR)/man1/cancel.1
	308	- $(LN) lp.1 $(MANDIR)/man1/cancel.1
fb198dce	309	- $(INSTALL_DIR) $(PMANDIR)/man3
	310	+ $(INSTALL_DIR) $(DESTDIR)$(PMANDIR)/man3
	311	for file in $(MAN3); do \
	312	- $(INSTALL_MAN) $$file $(PMANDIR)/man3/`basename $$file man`3; \
	313	+ $(INSTALL_MAN) $$file $(DESTDIR)$(MANDIR)/man3/`basename $$file man`3; \
	314	done
bfb43493	315	- $(INSTALL_DIR) $(MANDIR)/man5
fb198dce	316	+ $(INSTALL_DIR) $(DESTDIR)$(PMANDIR)/man5
bfb43493	317	for file in $(MAN5); do \
	318	- $(INSTALL_MAN) $$file $(MANDIR)/man5/`basename $$file man`5; \
	319	+ $(INSTALL_MAN) $$file $(DESTDIR)$(MANDIR)/man5/`basename $$file man`5; \
	320	done
	321	- $(INSTALL_DIR) $(AMANDIR)/man$(MAN8EXT)
fb198dce	322	+ $(INSTALL_DIR) $(DESTDIR)$(PMANDIR)/man8
bfb43493	323	for file in $(MAN8); do \
	324	- $(INSTALL_MAN) $$file $(AMANDIR)/man$(MAN8EXT)/`basename $$file man`$(MAN8EXT); \
	325	+ $(INSTALL_MAN) $$file $(DESTDIR)$(AMANDIR)/man$(MAN8EXT)/`basename $$file man`$(MAN8EXT); \
	326	done
	327	- $(RM) $(AMANDIR)/man$(MAN8EXT)/reject.$(MAN8EXT)
	328	- $(LN) accept.$(MAN8EXT) $(AMANDIR)/man$(MAN8EXT)/reject.$(MAN8EXT)
	329	- $(RM) $(AMANDIR)/man$(MAN8EXT)/disable.$(MAN8EXT)
	330	- $(LN) enable.$(MAN8EXT) $(AMANDIR)/man$(MAN8EXT)/disable.$(MAN8EXT)
	331	- $(INSTALL_DIR) $(MANDIR)/cat1
	332	- for file in $(CAT1); do \
	333	- $(INSTALL_MAN) $$file $(MANDIR)/cat1; \
	334	- done
	335	- $(RM) $(MANDIR)/cat1/cancel.$(CAT1EXT)
	336	- $(LN) lp.$(CAT1EXT) $(MANDIR)/cat1/cancel.$(CAT1EXT)
fb198dce	337	- $(INSTALL_DIR) $(PMANDIR)/cat3
	338	- for file in $(CAT3); do \
	339	- $(INSTALL_MAN) $$file $(PMANDIR)/cat3; \
	340	- done
bfb43493	341	- $(INSTALL_DIR) $(MANDIR)/cat5
	342	- for file in $(CAT5); do \
	343	- $(INSTALL_MAN) $$file $(MANDIR)/cat5; \
	344	- done
	345	- $(INSTALL_DIR) $(AMANDIR)/cat$(MAN8EXT)
	346	- for file in $(CAT8); do \
	347	- $(INSTALL_MAN) $$file $(AMANDIR)/cat$(MAN8EXT); \
	348	- done
	349	- $(RM) $(AMANDIR)/cat$(MAN8EXT)/reject.$(CAT8EXT)
	350	- $(LN) accept.$(CAT8EXT) $(AMANDIR)/cat$(MAN8EXT)/reject.$(CAT8EXT)
	351	- $(RM) $(AMANDIR)/cat$(MAN8EXT)/disable.$(CAT8EXT)
	352	- $(LN) enable.$(CAT8EXT) $(AMANDIR)/cat$(MAN8EXT)/disable.$(CAT8EXT)
bfb43493	353	+ echo ".so accept.$(MAN8EXT)" > $(DESTDIR)$(AMANDIR)/man$(MAN8EXT)/reject.$(MAN8EXT)
bfb43493	354	+ echo ".so enable.$(MAN8EXT)" > $(DESTDIR)$(AMANDIR)/man$(MAN8EXT)/disable.$(MAN8EXT)
fb198dce	355	+
fb198dce	356
d1d5300a	357
d1d5300a	358	#
fb198dce	359	diff -Nur cups-1.1.12/pdftops/Makefile cups-1.1.12-new/pdftops/Makefile
	360	--- cups-1.1.12/pdftops/Makefile Wed Jun 27 23:53:16 2001
	361	+++ cups-1.1.12-new/pdftops/Makefile Sat Nov 24 20:27:51 2001
d1d5300a	362	@@ -43,8 +43,8 @@
	363	#
	364
	365	install:
	366	- $(INSTALL_DIR) $(SERVERBIN)/filter
	367	- $(INSTALL_BIN) pdftops $(SERVERBIN)/filter
	368	+ $(INSTALL_DIR) $(DESTDIR)$(SERVERBIN)/filter
	369	+ $(INSTALL_BIN) pdftops $(DESTDIR)$(SERVERBIN)/filter
	370
	371
	372	#
fb198dce	373	diff -Nur cups-1.1.12/ppd/Makefile cups-1.1.12-new/ppd/Makefile
	374	--- cups-1.1.12/ppd/Makefile Thu Jul 19 22:17:56 2001
	375	+++ cups-1.1.12-new/ppd/Makefile Sat Nov 24 20:27:51 2001
bfb43493	376	@@ -52,9 +52,9 @@
d1d5300a	377	#
	378
	379	install:
bfb43493	380	- $(INSTALL_DIR) $(DATADIR)/model
	381	+ $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/model
	382	for file in $(FILES); do \
	383	- $(INSTALL_DATA) $$file $(DATADIR)/model; \
	384	+ $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/model; \
	385	done
	386
	387
fb198dce	388	diff -Nur cups-1.1.12/pstoraster/Makefile cups-1.1.12-new/pstoraster/Makefile
	389	--- cups-1.1.12/pstoraster/Makefile Wed Oct 31 17:18:33 2001
	390	+++ cups-1.1.12-new/pstoraster/Makefile Sat Nov 24 20:27:51 2001
bfb43493	391	@@ -376,11 +376,11 @@
	392	#
	393
	394	install: $(TARGETS)
	395	- $(INSTALL_DIR) $(SERVERBIN)/filter
	396	- $(INSTALL_BIN) pstoraster $(SERVERBIN)/filter
	397	- $(INSTALL_DIR) $(DATADIR)/pstoraster
	398	+ $(INSTALL_DIR) $(DESTDIR)$(SERVERBIN)/filter
	399	+ $(INSTALL_BIN) pstoraster $(DESTDIR)$(SERVERBIN)/filter
	400	+ $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/pstoraster
	401	for file in $(DFILES); do \
	402	- $(INSTALL_DATA) $$file $(DATADIR)/pstoraster; \
	403	+ $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/pstoraster; \
	404	done
d1d5300a	405
d1d5300a	406
fb198dce	407	diff -Nur cups-1.1.12/scheduler/Makefile cups-1.1.12-new/scheduler/Makefile
	408	--- cups-1.1.12/scheduler/Makefile Mon Jul 23 20:48:52 2001
	409	+++ cups-1.1.12-new/scheduler/Makefile Sat Nov 24 20:27:51 2001
bfb43493	410	@@ -52,17 +52,17 @@
d1d5300a	411	#
bfb43493	412
	413	install:
	414	- $(INSTALL_DIR) $(SBINDIR)
	415	- $(INSTALL_BIN) cupsd $(SBINDIR)
	416	- $(INSTALL_DIR) $(SERVERBIN)/daemon
	417	- $(INSTALL_BIN) cups-lpd $(SERVERBIN)/daemon
	418	- $(INSTALL_BIN) cups-polld $(SERVERBIN)/daemon
	419	- $(INSTALL_DIR) -m 711 -o $(CUPS_USER) -g $(CUPS_GROUP) $(SERVERROOT)/certs
	420	- $(INSTALL_DIR) $(SERVERROOT)/interfaces
	421	- $(INSTALL_DIR) $(SERVERROOT)/ppd
	422	- $(INSTALL_DIR) $(LOGDIR)
	423	- $(INSTALL_DIR) -m 700 -o $(CUPS_USER) -g $(CUPS_GROUP) $(REQUESTS)
	424	- $(INSTALL_DIR) -m 1700 -o $(CUPS_USER) -g $(CUPS_GROUP) $(REQUESTS)/tmp
	425	+ $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
	426	+ $(INSTALL_BIN) cupsd $(DESTDIR)$(SBINDIR)
	427	+ $(INSTALL_DIR) $(DESTDIR)$(SERVERBIN)/daemon
	428	+ $(INSTALL_BIN) cups-lpd $(DESTDIR)$(SERVERBIN)/daemon
	429	+ $(INSTALL_BIN) cups-polld $(DESTDIR)$(SERVERBIN)/daemon
	430	+ $(INSTALL_DIR) $(DESTDIR)$(SERVERROOT)/certs
	431	+ $(INSTALL_DIR) $(DESTDIR)$(SERVERROOT)/interfaces
	432	+ $(INSTALL_DIR) $(DESTDIR)$(SERVERROOT)/ppd
	433	+ $(INSTALL_DIR) $(DESTDIR)$(LOGDIR)
	434	+ $(INSTALL_DIR) $(DESTDIR)$(REQUESTS)
	435	+ $(INSTALL_DIR) $(DESTDIR)$(REQUESTS)/tmp
	436
	437
	438	#
fb198dce	439	diff -Nur cups-1.1.12/systemv/Makefile cups-1.1.12-new/systemv/Makefile
	440	--- cups-1.1.12/systemv/Makefile Tue Sep 18 21:14:47 2001
	441	+++ cups-1.1.12-new/systemv/Makefile Sat Nov 24 20:39:57 2001
	442	@@ -50,23 +50,20 @@
bfb43493	443	#
	444
	445	install:
	446	- $(INSTALL_DIR) $(BINDIR)
	447	- $(INSTALL_BIN) accept $(SBINDIR)
	448	- $(RM) $(SBINDIR)/reject
	449	- $(LN) accept $(SBINDIR)/reject
fb198dce	450	- $(INSTALL_BIN) cupsaddsmb $(SBINDIR)
bfb43493	451	- $(INSTALL_BIN) lpadmin $(SBINDIR)
	452	- $(INSTALL_BIN) lpinfo $(SBINDIR)
	453	- $(INSTALL_BIN) lpmove $(SBINDIR)
	454	- $(INSTALL_BIN) cancel $(BINDIR)
	455	- $(RM) $(BINDIR)/disable
	456	- $(LN) ../sbin/accept $(BINDIR)/disable
	457	- $(RM) $(BINDIR)/enable
	458	- $(LN) ../sbin/accept $(BINDIR)/enable
	459	- $(INSTALL_BIN) lp $(BINDIR)
	460	- $(INSTALL_BIN) lpoptions $(BINDIR)
	461	- $(INSTALL_BIN) lpstat $(BINDIR)
	462	- $(INSTALL_BIN) -m 4755 -o $(CUPS_USER) -g $(CUPS_GROUP) lppasswd $(BINDIR)
	463	+ $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
	464	+ $(INSTALL_BIN) accept $(DESTDIR)$(SBINDIR)
	465	+ $(LN) -sf accept $(DESTDIR)$(SBINDIR)/reject
fb198dce	466	+ $(INSTALL_BIN) cupsaddsmb $(DESTDIR)$(SBINDIR)
bfb43493	467	+ $(INSTALL_BIN) lpadmin $(DESTDIR)$(SBINDIR)
	468	+ $(INSTALL_BIN) lpinfo $(DESTDIR)$(SBINDIR)
	469	+ $(INSTALL_BIN) lpmove $(DESTDIR)$(SBINDIR)
	470	+ $(INSTALL_BIN) cancel $(DESTDIR)$(BINDIR)
	471	+ $(LN) -sf ../sbin/accept $(DESTDIR)$(BINDIR)/disable
	472	+ $(LN) -sf ../sbin/accept $(DESTDIR)$(BINDIR)/enable
	473	+ $(INSTALL_BIN) lp $(DESTDIR)$(BINDIR)
	474	+ $(INSTALL_BIN) lpoptions $(DESTDIR)$(BINDIR)
	475	+ $(INSTALL_BIN) lpstat $(DESTDIR)$(BINDIR)
	476	+ $(INSTALL_BIN) lppasswd $(DESTDIR)$(BINDIR)
	477
	478
	479	#
fb198dce	480	diff -Nur cups-1.1.12/templates/Makefile cups-1.1.12-new/templates/Makefile
	481	--- cups-1.1.12/templates/Makefile Mon Sep 24 19:51:16 2001
	482	+++ cups-1.1.12-new/templates/Makefile Sat Nov 24 20:27:51 2001
	483	@@ -92,9 +92,9 @@
d1d5300a	484	#
	485
	486	install:
	487	- $(INSTALL_DIR) $(DATADIR)/templates
d1d5300a	488	+ $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/templates
bfb43493	489	for file in $(FILES); do \
	490	- $(INSTALL_DATA) $$file $(DATADIR)/templates; \
	491	+ $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/templates; \
	492	done
d1d5300a	493
d1d5300a	494