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

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