- updated to 1.1.17

Changed files:
    cups-DESTDIR.patch -> 1.8

diff --git a/cups-DESTDIR.patch b/cups-DESTDIR.patch
index 6b4d933424277f0bf915c68829d3496ee638315d..c97b06df92ee1823eee1dd8343e2a1e73a7b1b6c 100644 (file)
--- a/cups-DESTDIR.patch
+++ b/cups-DESTDIR.patch
@@ -1,44 +1,5 @@
-diff -urN cups-1.1.16.org/Makefile cups-1.1.16/Makefile
---- cups-1.1.16.org/Makefile   Thu Nov  7 02:24:55 2002
-+++ cups-1.1.16/Makefile       Thu Nov  7 02:26:51 2002
-@@ -87,32 +87,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/PrintingServices"; then \
--                      $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDDIR)/PrintingServices; \
--                      $(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
- 
- #
- # Install source and header files...
-diff -urN cups-1.1.16.org/backend/Makefile cups-1.1.16/backend/Makefile
---- cups-1.1.16.org/backend/Makefile   Thu Nov  7 02:24:55 2002
-+++ cups-1.1.16/backend/Makefile       Thu Nov  7 02:27:33 2002
+--- cups-1.1.17/backend/Makefile.wiget Tue Oct 15 15:59:05 2002
++++ cups-1.1.17/backend/Makefile       Sun Dec  8 23:03:27 2002
 @@ -59,12 +59,12 @@
  #
  
@@ -56,9 +17,8 @@ diff -urN cups-1.1.16.org/backend/Makefile cups-1.1.16/backend/Makefile
  
  
  #
-diff -urN cups-1.1.16.org/berkeley/Makefile cups-1.1.16/berkeley/Makefile
---- cups-1.1.16.org/berkeley/Makefile  Thu Nov  7 02:24:55 2002
-+++ cups-1.1.16/berkeley/Makefile      Thu Nov  7 02:28:00 2002
+--- cups-1.1.17/berkeley/Makefile.wiget        Fri Mar  8 20:18:47 2002
++++ cups-1.1.17/berkeley/Makefile      Sun Dec  8 23:03:27 2002
 @@ -56,12 +56,12 @@
  #
  
@@ -78,9 +38,8 @@ diff -urN cups-1.1.16.org/berkeley/Makefile cups-1.1.16/berkeley/Makefile
  
  
  #
-diff -urN cups-1.1.16.org/cgi-bin/Makefile cups-1.1.16/cgi-bin/Makefile
---- cups-1.1.16.org/cgi-bin/Makefile   Thu Nov  7 02:24:55 2002
-+++ cups-1.1.16/cgi-bin/Makefile       Thu Nov  7 02:28:19 2002
+--- cups-1.1.17/cgi-bin/Makefile.wiget Fri Mar  8 20:18:47 2002
++++ cups-1.1.17/cgi-bin/Makefile       Sun Dec  8 23:03:27 2002
 @@ -58,9 +58,9 @@
  #
  
@@ -93,9 +52,8 @@ diff -urN cups-1.1.16.org/cgi-bin/Makefile cups-1.1.16/cgi-bin/Makefile
        done
  
  
-diff -urN cups-1.1.16.org/conf/Makefile cups-1.1.16/conf/Makefile
---- cups-1.1.16.org/conf/Makefile      Thu Nov  7 02:24:56 2002
-+++ cups-1.1.16/conf/Makefile  Thu Nov  7 02:29:08 2002
+--- cups-1.1.17/conf/Makefile.wiget    Fri Aug 30 22:56:43 2002
++++ cups-1.1.17/conf/Makefile  Sun Dec  8 23:03:27 2002
 @@ -51,23 +51,23 @@
  #
  
@@ -129,9 +87,8 @@ diff -urN cups-1.1.16.org/conf/Makefile cups-1.1.16/conf/Makefile
        fi
  
  
-diff -urN cups-1.1.16.org/cups/Makefile cups-1.1.16/cups/Makefile
---- cups-1.1.16.org/cups/Makefile      Thu Nov  7 02:24:56 2002
-+++ cups-1.1.16/cups/Makefile  Thu Nov  7 02:30:13 2002
+--- cups-1.1.17/cups/Makefile.wiget    Thu Sep  5 23:11:16 2002
++++ cups-1.1.17/cups/Makefile  Sun Dec  8 23:03:27 2002
 @@ -79,26 +79,26 @@
  #
  
@@ -170,9 +127,8 @@ diff -urN cups-1.1.16.org/cups/Makefile cups-1.1.16/cups/Makefile
        done
  
  
-diff -urN cups-1.1.16.org/data/Makefile cups-1.1.16/data/Makefile
---- cups-1.1.16.org/data/Makefile      Thu Nov  7 02:24:56 2002
-+++ cups-1.1.16/data/Makefile  Thu Nov  7 02:30:51 2002
+--- cups-1.1.17/data/Makefile.wiget    Fri Aug 30 22:56:44 2002
++++ cups-1.1.17/data/Makefile  Sun Dec  8 23:03:27 2002
 @@ -85,17 +85,17 @@
  #
  
@@ -197,42 +153,8 @@ diff -urN cups-1.1.16.org/data/Makefile cups-1.1.16/data/Makefile
        done
  
  
-diff -urN cups-1.1.16.org/doc/Makefile cups-1.1.16/doc/Makefile
---- cups-1.1.16.org/doc/Makefile       Thu Nov  7 02:24:57 2002
-+++ cups-1.1.16/doc/Makefile   Thu Nov  7 02:56:32 2002
-@@ -123,21 +123,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
-       cd fr; make install
- 
-diff -urN cups-1.1.16.org/doc/fr/Makefile cups-1.1.16/doc/fr/Makefile
---- cups-1.1.16.org/doc/fr/Makefile    Thu Nov  7 02:24:57 2002
-+++ cups-1.1.16/doc/fr/Makefile        Thu Nov  7 02:32:03 2002
+--- cups-1.1.17/doc/fr/Makefile.wiget  Tue Oct 15 15:54:44 2002
++++ cups-1.1.17/doc/fr/Makefile        Sun Dec  8 23:03:27 2002
 @@ -106,21 +106,21 @@
  #
  
@@ -263,9 +185,40 @@ diff -urN cups-1.1.16.org/doc/fr/Makefile cups-1.1.16/doc/fr/Makefile
        done
  
  
-diff -urN cups-1.1.16.org/filter/Makefile cups-1.1.16/filter/Makefile
---- cups-1.1.16.org/filter/Makefile    Thu Nov  7 02:24:58 2002
-+++ cups-1.1.16/filter/Makefile        Thu Nov  7 02:32:56 2002
+--- cups-1.1.17/doc/Makefile.wiget     Mon Oct 21 01:34:54 2002
++++ cups-1.1.17/doc/Makefile   Sun Dec  8 23:03:27 2002
+@@ -123,21 +123,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
+       cd fr; $(MAKE) $(MFLAGS) install
+ 
+--- cups-1.1.17/filter/Makefile.wiget  Tue Oct 22 20:43:45 2002
++++ cups-1.1.17/filter/Makefile        Sun Dec  8 23:03:27 2002
 @@ -70,30 +70,30 @@
  #
  
@@ -311,9 +264,8 @@ diff -urN cups-1.1.16.org/filter/Makefile cups-1.1.16/filter/Makefile
  
  
  #
-diff -urN cups-1.1.16.org/fonts/Makefile cups-1.1.16/fonts/Makefile
---- cups-1.1.16.org/fonts/Makefile     Thu Nov  7 02:24:59 2002
-+++ cups-1.1.16/fonts/Makefile Thu Nov  7 02:33:13 2002
+--- cups-1.1.17/fonts/Makefile.wiget   Mon Jun 24 22:21:58 2002
++++ cups-1.1.17/fonts/Makefile Sun Dec  8 23:03:27 2002
 @@ -51,9 +51,9 @@
  #
  
@@ -326,9 +278,8 @@ diff -urN cups-1.1.16.org/fonts/Makefile cups-1.1.16/fonts/Makefile
        done
  
  
-diff -urN cups-1.1.16.org/locale/Makefile cups-1.1.16/locale/Makefile
---- cups-1.1.16.org/locale/Makefile    Thu Nov  7 02:24:59 2002
-+++ cups-1.1.16/locale/Makefile        Thu Nov  7 02:33:31 2002
+--- cups-1.1.17/locale/Makefile.wiget  Tue Feb 12 20:37:51 2002
++++ cups-1.1.17/locale/Makefile        Sun Dec  8 23:03:27 2002
 @@ -51,10 +51,10 @@
  #
  
@@ -343,91 +294,8 @@ diff -urN cups-1.1.16.org/locale/Makefile cups-1.1.16/locale/Makefile
        done
  
  
-diff -urN cups-1.1.16.org/man/Makefile cups-1.1.16/man/Makefile
---- cups-1.1.16.org/man/Makefile       Thu Nov  7 02:24:59 2002
-+++ cups-1.1.16/man/Makefile   Thu Nov  7 02:35:07 2002
-@@ -68,50 +68,50 @@
- #
- 
- install:      all
--      $(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
-+      $(RM) $(DESTDIR)$(MANDIR)/man1/cancel.1
-+      $(LN) lp.1 $(DESTDIR)$(MANDIR)/man1/cancel.1
-+      $(INSTALL_DIR) $(DESTDIR)$(PMANDIR)/man3
-       for file in $(MAN3); do \
--              $(INSTALL_MAN) $$file $(PMANDIR)/man3/`basename $$file man`3; \
-+              $(INSTALL_MAN) $$file $(DESTDIR)$(PMANDIR)/man3/`basename $$file man`3; \
-       done
--      $(INSTALL_DIR) $(MANDIR)/man5
-+      $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/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)$(AMANDIR)/man$(MAN8EXT)
-       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
-+      $(RM) $(DESTDIR)$(AMANDIR)/man$(MAN8EXT)/reject.$(MAN8EXT)
-+      $(LN) accept.$(MAN8EXT) $(DESTDIR)$(AMANDIR)/man$(MAN8EXT)/reject.$(MAN8EXT)
-+      $(RM) $(DESTDIR)$(AMANDIR)/man$(MAN8EXT)/disable.$(MAN8EXT)
-+      $(LN) enable.$(MAN8EXT) $(DESTDIR)$(AMANDIR)/man$(MAN8EXT)/disable.$(MAN8EXT)
-+      $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/cat1
-       for file in $(CAT1); do \
--              $(INSTALL_MAN) $$file $(MANDIR)/cat1; \
-+              $(INSTALL_MAN) $$file $(DESTDIR)$(MANDIR)/cat1; \
-       done
--      $(RM) $(MANDIR)/cat1/cancel.$(CAT1EXT)
--      $(LN) lp.$(CAT1EXT) $(MANDIR)/cat1/cancel.$(CAT1EXT)
--      $(INSTALL_DIR) $(PMANDIR)/cat3
-+      $(RM) $(DESTDIR)$(MANDIR)/cat1/cancel.$(CAT1EXT)
-+      $(LN) lp.$(CAT1EXT) $(DESTDIR)$(MANDIR)/cat1/cancel.$(CAT1EXT)
-+      $(INSTALL_DIR) $(DESTDIR)$(PMANDIR)/cat3
-       for file in $(CAT3); do \
--              $(INSTALL_MAN) $$file $(PMANDIR)/cat3; \
-+              $(INSTALL_MAN) $$file $(DESTDIR)$(PMANDIR)/cat3; \
-       done
--      $(INSTALL_DIR) $(MANDIR)/cat5
-+      $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/cat5
-       for file in $(CAT5); do \
--              $(INSTALL_MAN) $$file $(MANDIR)/cat5; \
-+              $(INSTALL_MAN) $$file $(DESTDIR)$(MANDIR)/cat5; \
-       done
--      $(INSTALL_DIR) $(AMANDIR)/cat$(MAN8EXT)
-+      $(INSTALL_DIR) $(DESTDIR)$(AMANDIR)/cat$(MAN8EXT)
-       for file in $(CAT8); do \
--              $(INSTALL_MAN) $$file $(AMANDIR)/cat$(MAN8EXT); \
-+              $(INSTALL_MAN) $$file $(DESTDIR)$(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)
-+      $(RM) $(DESTDIR)$(AMANDIR)/cat$(MAN8EXT)/reject.$(CAT8EXT)
-+      $(LN) accept.$(CAT8EXT) $(DESTDIR)$(AMANDIR)/cat$(MAN8EXT)/reject.$(CAT8EXT)
-+      $(RM) $(DESTDIR)$(AMANDIR)/cat$(MAN8EXT)/disable.$(CAT8EXT)
-+      $(LN) enable.$(CAT8EXT) $(DESTDIR)$(AMANDIR)/cat$(MAN8EXT)/disable.$(CAT8EXT)
-       for dir in $(LANGDIRS); do \
-               echo "Installing all in man/$$dir..."; \
-               (cd $$dir; make install); \
-diff -urN cups-1.1.16.org/man/fr/Makefile cups-1.1.16/man/fr/Makefile
---- cups-1.1.16.org/man/fr/Makefile    Thu Nov  7 02:24:59 2002
-+++ cups-1.1.16/man/fr/Makefile        Thu Nov  7 02:36:31 2002
+--- cups-1.1.17/man/fr/Makefile.wiget  Thu Jun  6 14:31:25 2002
++++ cups-1.1.17/man/fr/Makefile        Sun Dec  8 23:03:27 2002
 @@ -60,50 +60,50 @@
  #
  
@@ -507,10 +375,90 @@ diff -urN cups-1.1.16.org/man/fr/Makefile cups-1.1.16/man/fr/Makefile
  
  
  #
-diff -urN cups-1.1.16.org/pdftops/Makefile cups-1.1.16/pdftops/Makefile
---- cups-1.1.16.org/pdftops/Makefile   Thu Nov  7 02:25:03 2002
-+++ cups-1.1.16/pdftops/Makefile       Thu Nov  7 02:36:48 2002
-@@ -90,8 +90,8 @@
+--- cups-1.1.17/man/Makefile.wiget     Sun Oct 20 22:13:53 2002
++++ cups-1.1.17/man/Makefile   Sun Dec  8 23:03:27 2002
+@@ -68,50 +68,50 @@
+ #
+ 
+ install:      all
+-      $(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
++      $(RM) $(DESTDIR)$(MANDIR)/man1/cancel.1
++      $(LN) lp.1 $(DESTDIR)$(MANDIR)/man1/cancel.1
++      $(INSTALL_DIR) $(DESTDIR)$(PMANDIR)/man3
+       for file in $(MAN3); do \
+-              $(INSTALL_MAN) $$file $(PMANDIR)/man3/`basename $$file man`3; \
++              $(INSTALL_MAN) $$file $(DESTDIR)$(PMANDIR)/man3/`basename $$file man`3; \
+       done
+-      $(INSTALL_DIR) $(MANDIR)/man5
++      $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/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)$(AMANDIR)/man$(MAN8EXT)
+       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
++      $(RM) $(DESTDIR)$(AMANDIR)/man$(MAN8EXT)/reject.$(MAN8EXT)
++      $(LN) accept.$(MAN8EXT) $(DESTDIR)$(AMANDIR)/man$(MAN8EXT)/reject.$(MAN8EXT)
++      $(RM) $(DESTDIR)$(AMANDIR)/man$(MAN8EXT)/disable.$(MAN8EXT)
++      $(LN) enable.$(MAN8EXT) $(DESTDIR)$(AMANDIR)/man$(MAN8EXT)/disable.$(MAN8EXT)
++      $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/cat1
+       for file in $(CAT1); do \
+-              $(INSTALL_MAN) $$file $(MANDIR)/cat1; \
++              $(INSTALL_MAN) $$file $(DESTDIR)$(MANDIR)/cat1; \
+       done
+-      $(RM) $(MANDIR)/cat1/cancel.$(CAT1EXT)
+-      $(LN) lp.$(CAT1EXT) $(MANDIR)/cat1/cancel.$(CAT1EXT)
+-      $(INSTALL_DIR) $(PMANDIR)/cat3
++      $(RM) $(DESTDIR)$(MANDIR)/cat1/cancel.$(CAT1EXT)
++      $(LN) lp.$(CAT1EXT) $(DESTDIR)$(MANDIR)/cat1/cancel.$(CAT1EXT)
++      $(INSTALL_DIR) $(DESTDIR)$(PMANDIR)/cat3
+       for file in $(CAT3); do \
+-              $(INSTALL_MAN) $$file $(PMANDIR)/cat3; \
++              $(INSTALL_MAN) $$file $(DESTDIR)$(PMANDIR)/cat3; \
+       done
+-      $(INSTALL_DIR) $(MANDIR)/cat5
++      $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/cat5
+       for file in $(CAT5); do \
+-              $(INSTALL_MAN) $$file $(MANDIR)/cat5; \
++              $(INSTALL_MAN) $$file $(DESTDIR)$(MANDIR)/cat5; \
+       done
+-      $(INSTALL_DIR) $(AMANDIR)/cat$(MAN8EXT)
++      $(INSTALL_DIR) $(DESTDIR)$(AMANDIR)/cat$(MAN8EXT)
+       for file in $(CAT8); do \
+-              $(INSTALL_MAN) $$file $(AMANDIR)/cat$(MAN8EXT); \
++              $(INSTALL_MAN) $$file $(DESTDIR)$(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)
++      $(RM) $(DESTDIR)$(AMANDIR)/cat$(MAN8EXT)/reject.$(CAT8EXT)
++      $(LN) accept.$(CAT8EXT) $(DESTDIR)$(AMANDIR)/cat$(MAN8EXT)/reject.$(CAT8EXT)
++      $(RM) $(DESTDIR)$(AMANDIR)/cat$(MAN8EXT)/disable.$(CAT8EXT)
++      $(LN) enable.$(CAT8EXT) $(DESTDIR)$(AMANDIR)/cat$(MAN8EXT)/disable.$(CAT8EXT)
+       for dir in $(LANGDIRS); do \
+               echo "Installing all in man/$$dir..."; \
+               (cd $$dir; $(MAKE) $(MFLAGS) install); \
+--- cups-1.1.17/pdftops/Makefile.wiget Thu Oct 10 01:23:07 2002
++++ cups-1.1.17/pdftops/Makefile       Sun Dec  8 23:03:27 2002
+@@ -86,8 +86,8 @@
  #
  
  install:      all
@@ -521,9 +469,8 @@ diff -urN cups-1.1.16.org/pdftops/Makefile cups-1.1.16/pdftops/Makefile
  
  
  #
-diff -urN cups-1.1.16.org/ppd/Makefile cups-1.1.16/ppd/Makefile
---- cups-1.1.16.org/ppd/Makefile       Thu Nov  7 02:25:04 2002
-+++ cups-1.1.16/ppd/Makefile   Thu Nov  7 02:37:02 2002
+--- cups-1.1.17/ppd/Makefile.wiget     Wed Jan  2 18:59:08 2002
++++ cups-1.1.17/ppd/Makefile   Sun Dec  8 23:03:27 2002
 @@ -52,9 +52,9 @@
  #
  
@@ -536,9 +483,8 @@ diff -urN cups-1.1.16.org/ppd/Makefile cups-1.1.16/ppd/Makefile
        done
  
  
-diff -urN cups-1.1.16.org/scheduler/Makefile cups-1.1.16/scheduler/Makefile
---- cups-1.1.16.org/scheduler/Makefile Thu Nov  7 02:25:05 2002
-+++ cups-1.1.16/scheduler/Makefile     Thu Nov  7 02:37:33 2002
+--- cups-1.1.17/scheduler/Makefile.wiget       Wed Jun  5 16:50:59 2002
++++ cups-1.1.17/scheduler/Makefile     Sun Dec  8 23:03:27 2002
 @@ -60,17 +60,17 @@
  #
  
@@ -568,9 +514,8 @@ diff -urN cups-1.1.16.org/scheduler/Makefile cups-1.1.16/scheduler/Makefile
  
  
  #
-diff -urN cups-1.1.16.org/systemv/Makefile cups-1.1.16/systemv/Makefile
---- cups-1.1.16.org/systemv/Makefile   Thu Nov  7 02:25:05 2002
-+++ cups-1.1.16/systemv/Makefile       Thu Nov  7 02:44:27 2002
+--- cups-1.1.17/systemv/Makefile.wiget Wed Jun  5 17:11:58 2002
++++ cups-1.1.17/systemv/Makefile       Sun Dec  8 23:03:27 2002
 @@ -58,25 +58,25 @@
  #
  
@@ -616,33 +561,68 @@ diff -urN cups-1.1.16.org/systemv/Makefile cups-1.1.16/systemv/Makefile
  
  
  #
-diff -urN cups-1.1.16.org/templates/Makefile cups-1.1.16/templates/Makefile
---- cups-1.1.16.org/templates/Makefile Thu Nov  7 02:25:05 2002
-+++ cups-1.1.16/templates/Makefile     Thu Nov  7 02:38:44 2002
-@@ -95,9 +95,9 @@
+--- cups-1.1.17/templates/fr/Makefile.wiget    Tue Oct 15 15:54:47 2002
++++ cups-1.1.17/templates/fr/Makefile  Sun Dec  8 23:08:40 2002
+@@ -94,9 +94,9 @@
  #
  
  install:
--      $(INSTALL_DIR) $(DATADIR)/templates
-+      $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/templates
+-      $(INSTALL_DIR) $(DATADIR)/templates/fr
++      $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/templates/fr
        for file in $(FILES); do \
--              $(INSTALL_DATA) $$file $(DATADIR)/templates; \
-+              $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/templates; \
+-              $(INSTALL_DATA) $$file $(DATADIR)/templates/fr; \
++              $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/templates/fr; \
        done
-       cd fr; make install
  
-diff -urN cups-1.1.16.org/templates/fr/Makefile cups-1.1.16/templates/fr/Makefile
---- cups-1.1.16.org/templates/fr/Makefile      Thu Nov  7 02:25:06 2002
-+++ cups-1.1.16/templates/fr/Makefile  Thu Nov  7 02:38:56 2002
-@@ -94,9 +94,9 @@
+ 
+--- cups-1.1.17/templates/Makefile.wiget       Sun Oct 20 22:15:02 2002
++++ cups-1.1.17/templates/Makefile     Sun Dec  8 23:03:27 2002
+@@ -95,9 +95,9 @@
  #
  
  install:
--      $(INSTALL_DIR) $(DATADIR)/fr/templates
-+      $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/fr/templates
+-      $(INSTALL_DIR) $(DATADIR)/templates
++      $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/templates
        for file in $(FILES); do \
--              $(INSTALL_DATA) $$file $(DATADIR)/fr/templates; \
-+              $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/fr/templates; \
+-              $(INSTALL_DATA) $$file $(DATADIR)/templates; \
++              $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/templates; \
        done
+       cd fr; $(MAKE) $(MFLAGS) install
  
+--- cups-1.1.17/Makefile.wiget Tue Apr 23 19:49:34 2002
++++ cups-1.1.17/Makefile       Sun Dec  8 23:03:27 2002
+@@ -87,32 +87,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/PrintingServices"; then \
+-                      $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDDIR)/PrintingServices; \
+-                      $(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
  
+ #
+ # Install source and header files...