- fixed process name at "status" and at lockfile in /var/lock/subsys

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

diff --git a/cups-DESTDIR.patch b/cups-DESTDIR.patch
index e37079b3df9307513d593d415e6d1b5d092a119f..3e31d43c19bde996862d3b03db95778fc237284c 100644 (file)
--- a/cups-DESTDIR.patch
+++ b/cups-DESTDIR.patch
@@ -1,13 +1,14 @@
-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 @@
+--- 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
--      echo Installing startup 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; \
@@ -22,8 +23,8 @@ diff -Nur cups-1.1.12/Makefile cups-1.1.12-new/Makefile
 -      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; \
+-              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; \
@@ -153,10 +154,9 @@ diff -Nur cups-1.1.12/cups/Makefile cups-1.1.12-new/cups/Makefile
  
  
  #
-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 @@
+--- 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:
@@ -178,7 +178,7 @@ diff -Nur cups-1.1.12/data/Makefile cups-1.1.12-new/data/Makefile
 -              $(INSTALL_DATA) $$file $(DATADIR)/data; \
 +              $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/data; \
        done
--      -if test x$(PAMDIR) != x; then \
+-      -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; \
@@ -186,11 +186,12 @@ diff -Nur cups-1.1.12/data/Makefile cups-1.1.12-new/data/Makefile
 -                      $(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
@@ -224,10 +225,9 @@ diff -Nur cups-1.1.12/doc/Makefile cups-1.1.12-new/doc/Makefile
        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 @@
+--- 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:
@@ -248,15 +248,17 @@ diff -Nur cups-1.1.12/filter/Makefile cups-1.1.12-new/filter/Makefile
 -              $(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) raster.h $(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