-diff -Nru cups-1.1.10/Makefile cups-1.1.10.new/Makefile
---- cups-1.1.10/Makefile Mon Aug 6 21:37:08 2001
-+++ cups-1.1.10.new/Makefile Sun Sep 2 19:49:29 2001
-@@ -74,24 +74,6 @@
- (cd ppd; $(MAKE) $(MFLAGS) install)
+diff -urN cups-1.1.19.orig/Makefile cups-1.1.19/Makefile
+--- cups-1.1.19.orig/Makefile Tue May 27 23:14:31 2003
++++ cups-1.1.19/Makefile Tue May 27 23:29:58 2003
+@@ -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) $(prefix)/$(INITDIR)/init.d; \
-- $(INSTALL_SCRIPT) cups.sh $(prefix)/$(INITDIR)/init.d/cups; \
-- $(INSTALL_DIR) $(prefix)/$(INITDIR)/rc0.d; \
-- $(INSTALL_SCRIPT) cups.sh $(prefix)/$(INITDIR)/rc0.d/K00cups; \
-- $(INSTALL_DIR) $(prefix)/$(INITDIR)/rc2.d; \
-- $(INSTALL_SCRIPT) cups.sh $(prefix)/$(INITDIR)/rc2.d/S99cups; \
-- $(INSTALL_DIR) $(prefix)/$(INITDIR)/rc3.d; \
-- $(INSTALL_SCRIPT) cups.sh $(prefix)/$(INITDIR)/rc3.d/S99cups; \
-- $(INSTALL_DIR) $(prefix)/$(INITDIR)/rc5.d; \
-- $(INSTALL_SCRIPT) cups.sh $(prefix)/$(INITDIR)/rc5.d/S99cups; \
+- $(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) $(prefix)/$(INITDDIR); \
-- $(INSTALL_SCRIPT) cups.sh $(prefix)/$(INITDDIR)/cups; \
+- $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \
+- if test "$(INITDDIR)" = "/System/Library/StartupItems/PrintingServices"; then \
+- $(INSTALL_SCRIPT) cups.osx $(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
#
- # Run the test suite...
-diff -Nru cups-1.1.10/backend/Makefile cups-1.1.10.new/backend/Makefile
---- cups-1.1.10/backend/Makefile Tue Jul 24 21:56:41 2001
-+++ cups-1.1.10.new/backend/Makefile Sun Sep 2 19:50:56 2001
-@@ -49,12 +49,11 @@
+ # Install source and header files...
+diff -urN cups-1.1.19.orig/backend/Makefile cups-1.1.19/backend/Makefile
+--- cups-1.1.19.orig/backend/Makefile Tue May 27 23:14:31 2003
++++ cups-1.1.19/backend/Makefile Tue May 27 23:15:51 2003
+@@ -59,12 +59,12 @@
#
- install:
+ install: all
- $(INSTALL_DIR) $(SERVERBIN)/backend
+ $(INSTALL_DIR) $(DESTDIR)$(SERVERBIN)/backend
for file in $(BACKENDS); do \
done
- $(RM) $(SERVERBIN)/backend/http
- $(LN) ipp $(SERVERBIN)/backend/http
-+ $(LN) -sf ipp $(DESTDIR)$(SERVERBIN)/backend/http
++ $(RM) $(DESTDIR)$(SERVERBIN)/backend/http
++ $(LN) ipp $(DESTDIR)$(SERVERBIN)/backend/http
#
-diff -Nru cups-1.1.10/berkeley/Makefile cups-1.1.10.new/berkeley/Makefile
---- cups-1.1.10/berkeley/Makefile Thu Jul 19 22:17:51 2001
-+++ cups-1.1.10.new/berkeley/Makefile Sun Sep 2 19:51:27 2001
-@@ -48,12 +48,12 @@
+diff -urN cups-1.1.19.orig/berkeley/Makefile cups-1.1.19/berkeley/Makefile
+--- cups-1.1.19.orig/berkeley/Makefile Tue May 27 23:14:31 2003
++++ cups-1.1.19/berkeley/Makefile Tue May 27 23:15:51 2003
+@@ -56,12 +56,12 @@
#
- install:
+ install: all
- $(INSTALL_DIR) $(BINDIR)
- $(INSTALL_BIN) lpq $(BINDIR)
- $(INSTALL_BIN) lpr $(BINDIR)
#
-diff -Nru cups-1.1.10/cgi-bin/Makefile cups-1.1.10.new/cgi-bin/Makefile
---- cups-1.1.10/cgi-bin/Makefile Thu Jul 19 22:17:51 2001
-+++ cups-1.1.10.new/cgi-bin/Makefile Sun Sep 2 19:51:48 2001
-@@ -50,9 +50,9 @@
+diff -urN cups-1.1.19.orig/cgi-bin/Makefile cups-1.1.19/cgi-bin/Makefile
+--- cups-1.1.19.orig/cgi-bin/Makefile Tue May 27 23:14:31 2003
++++ cups-1.1.19/cgi-bin/Makefile Tue May 27 23:15:51 2003
+@@ -58,9 +58,9 @@
#
- install:
+ install: all
- $(INSTALL_DIR) $(SERVERBIN)/cgi-bin
+ $(INSTALL_DIR) $(DESTDIR)$(SERVERBIN)/cgi-bin
for file in $(CGIS); do \
done
-diff -Nru cups-1.1.10/conf/Makefile cups-1.1.10.new/conf/Makefile
---- cups-1.1.10/conf/Makefile Wed Jun 27 23:53:08 2001
-+++ cups-1.1.10.new/conf/Makefile Sun Sep 2 19:40:12 2001
-@@ -51,19 +51,12 @@
+diff -urN cups-1.1.19.orig/conf/Makefile cups-1.1.19/conf/Makefile
+--- cups-1.1.19.orig/conf/Makefile Tue May 27 23:14:31 2003
++++ cups-1.1.19/conf/Makefile Tue May 27 23:15:51 2003
+@@ -51,23 +51,23 @@
#
install:
for file in $(KEEP); do \
- if test -r $(SERVERROOT)/$$file ; then \
- $(INSTALL_DATA) $$file $(SERVERROOT)/$$file.N ; \
-- else \
++ if test -r $(DESTDIR)$(SERVERROOT)/$$file ; then \
++ $(INSTALL_DATA) $$file $(DESTDIR)$(SERVERROOT)/$$file.N ; \
+ else \
- $(INSTALL_DATA) $$file $(SERVERROOT) ; \
-- fi ; \
-+ $(INSTALL_DATA) $$file $(DESTDIR)$(SERVERROOT) ; \
++ $(INSTALL_DATA) $$file $(DESTDIR)$(SERVERROOT) ; \
+ fi ; \
done
for file in $(REPLACE); do \
- if test -r $(SERVERROOT)/$$file ; then \
- $(MV) $(SERVERROOT)/$$file $(SERVERROOT)/$$file.O ; \
-- fi ; \
++ if test -r $(DESTDIR)$(SERVERROOT)/$$file ; then \
++ $(MV) $(DESTDIR)$(SERVERROOT)/$$file $(DESTDIR)$(SERVERROOT)/$$file.O ; \
+ fi ; \
- $(INSTALL_DATA) $$file $(SERVERROOT) ; \
+ $(INSTALL_DATA) $$file $(DESTDIR)$(SERVERROOT) ; \
done
+ -if test x$(PAMDIR) != x$(BUILDROOT); then \
+- $(INSTALL_DIR) $(PAMDIR); \
+- $(INSTALL_DATA) pam.conf $(PAMDIR)/cups; \
++ $(INSTALL_DIR) $(DESTDIR)$(PAMDIR); \
++ $(INSTALL_DATA) pam.conf $(DESTDIR)$(PAMDIR)/cups; \
+ fi
-diff -Nru cups-1.1.10/cups/Makefile cups-1.1.10.new/cups/Makefile
---- cups-1.1.10/cups/Makefile Mon Aug 6 21:37:09 2001
-+++ cups-1.1.10.new/cups/Makefile Sun Sep 2 19:53:05 2001
-@@ -68,21 +68,14 @@
+diff -urN cups-1.1.19.orig/cups/Makefile cups-1.1.19/cups/Makefile
+--- cups-1.1.19.orig/cups/Makefile Tue May 27 23:14:31 2003
++++ cups-1.1.19/cups/Makefile Tue May 27 23:15:51 2003
+@@ -80,26 +80,26 @@
#
- install: all
+ install: all installhdrs
+- $(INSTALL_DIR) $(LIBDIR)
+- $(INSTALL_LIB) $(LIBCUPS) $(LIBDIR)
++ $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
++ $(INSTALL_LIB) $(LIBCUPS) $(DESTDIR)$(LIBDIR)
+ if test $(LIBCUPS) = "libcups.so.2" -o $(LIBCUPS) = "libcups.sl.2"; then \
+- $(RM) $(LIBDIR)/`basename $(LIBCUPS) .2`; \
+- $(LN) $(LIBCUPS) $(LIBDIR)/`basename $(LIBCUPS) .2`; \
++ $(RM) $(DESTDIR)$(LIBDIR)/`basename $(LIBCUPS) .2`; \
++ $(LN) $(LIBCUPS) $(DESTDIR)$(LIBDIR)/`basename $(LIBCUPS) .2`; \
+ fi
+ if test $(LIBCUPS) = "libcups.2.dylib"; then \
+- $(STRIP) -x $(LIBDIR)/$(LIBCUPS); \
+- $(RM) $(LIBDIR)/libcups.dylib; \
+- $(LN) $(LIBCUPS) $(LIBDIR)/libcups.dylib; \
++ $(STRIP) -x $(DESTDIR)$(LIBDIR)/$(LIBCUPS); \
++ $(RM) $(DESTDIR)$(LIBDIR)/libcups.dylib; \
++ $(LN) $(LIBCUPS) $(DESTDIR)$(LIBDIR)/libcups.dylib; \
+ fi
+ if test $(LIBCUPS) != "libcups.a"; then \
+- $(INSTALL_LIB) libcups.a $(LIBDIR); \
++ $(INSTALL_LIB) libcups.a $(DESTDIR)$(LIBDIR); \
+ fi
+- $(RANLIB) $(LIBDIR)/libcups.a
++ $(RANLIB) $(DESTDIR)$(LIBDIR)/libcups.a
+
+ installhdrs:
- $(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_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)
- #
- # libcups.so.2, libcups.sl.2
-diff -Nru cups-1.1.10/data/Makefile cups-1.1.10.new/data/Makefile
---- cups-1.1.10/data/Makefile Thu Jul 19 22:17:52 2001
-+++ cups-1.1.10.new/data/Makefile Sun Sep 2 19:54:16 2001
-@@ -81,26 +81,20 @@
+
+diff -urN cups-1.1.19.orig/data/Makefile cups-1.1.19/data/Makefile
+--- cups-1.1.19.orig/data/Makefile Tue May 27 23:14:31 2003
++++ cups-1.1.19/data/Makefile Tue May 27 23:15:51 2003
+@@ -84,17 +84,17 @@
#
install:
- $(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 -Nru cups-1.1.10/doc/Makefile cups-1.1.10.new/doc/Makefile
---- cups-1.1.10/doc/Makefile Thu Jul 19 22:17:53 2001
-+++ cups-1.1.10.new/doc/Makefile Sun Sep 2 19:55:11 2001
-@@ -118,21 +118,21 @@
+diff -urN cups-1.1.19.orig/doc/Makefile cups-1.1.19/doc/Makefile
+--- cups-1.1.19.orig/doc/Makefile Tue May 27 23:14:31 2003
++++ cups-1.1.19/doc/Makefile Tue May 27 23:15:51 2003
+@@ -123,21 +123,21 @@
#
install:
- $(INSTALL_MAN) $$file $(DOCDIR)/images; \
+ $(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR)/images; \
done
+ cd de; $(MAKE) $(MFLAGS) install
+ cd fr; $(MAKE) $(MFLAGS) install
+diff -urN cups-1.1.19.orig/doc/de/Makefile cups-1.1.19/doc/de/Makefile
+--- cups-1.1.19.orig/doc/de/Makefile Tue May 27 23:14:31 2003
++++ cups-1.1.19/doc/de/Makefile Tue May 27 23:48:58 2003
+@@ -75,13 +75,13 @@
+ #
+ install:
+- $(INSTALL_DIR) $(DOCDIR)/de
++ $(INSTALL_DIR) $(DESTDIR)$(DOCDIR)/de
+ for file in $(WEBPAGES); do \
+- $(INSTALL_MAN) $$file $(DOCDIR)/de; \
++ $(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR)/de; \
+ done
+- $(INSTALL_DIR) $(DOCDIR)/de/images
++ $(INSTALL_DIR) $(DESTDIR)$(DOCDIR)/de/images
+ for file in $(WEBIMAGES); do \
+- $(INSTALL_MAN) $$file $(DOCDIR)/de/images; \
++ $(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR)/de/images; \
+ done
-diff -Nru cups-1.1.10/filter/Makefile cups-1.1.10.new/filter/Makefile
---- cups-1.1.10/filter/Makefile Fri Aug 17 17:54:02 2001
-+++ cups-1.1.10.new/filter/Makefile Sun Sep 2 19:56:05 2001
-@@ -59,19 +59,15 @@
+
+diff -urN cups-1.1.19.orig/doc/fr/Makefile cups-1.1.19/doc/fr/Makefile
+--- cups-1.1.19.orig/doc/fr/Makefile Tue May 27 23:14:31 2003
++++ cups-1.1.19/doc/fr/Makefile Tue May 27 23:15:51 2003
+@@ -105,21 +105,21 @@
#
install:
+- $(INSTALL_DIR) $(DOCDIR)/fr
++ $(INSTALL_DIR) $(DESTDIR)$(DOCDIR)/fr
+ for file in $(WEBPAGES); do \
+- $(INSTALL_MAN) $$file $(DOCDIR)/fr; \
++ $(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR)/fr; \
+ done
+- $(INSTALL_MAN) overview.html $(DOCDIR)/fr
+- $(INSTALL_MAN) overview.pdf $(DOCDIR)/fr
++ $(INSTALL_MAN) overview.html $(DESTDIR)$(DOCDIR)/fr
++ $(INSTALL_MAN) overview.pdf $(DESTDIR)$(DOCDIR)/fr
+ for file in $(DOCUMENTS:.shtml=.html); do \
+- $(INSTALL_MAN) $$file $(DOCDIR)/fr; \
++ $(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR)/fr; \
+ done
+ for file in $(DOCUMENTS:.shtml=.pdf); do \
+- $(INSTALL_MAN) $$file $(DOCDIR)/fr; \
++ $(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR)/fr; \
+ done
+- $(INSTALL_DIR) $(DOCDIR)/fr/images
++ $(INSTALL_DIR) $(DESTDIR)$(DOCDIR)/fr/images
+ for file in $(WEBIMAGES); do \
+- $(INSTALL_MAN) $$file $(DOCDIR)/fr/images; \
++ $(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR)/fr/images; \
+ done
+
+
+diff -urN cups-1.1.19.orig/filter/Makefile cups-1.1.19/filter/Makefile
+--- cups-1.1.19.orig/filter/Makefile Tue May 27 23:14:31 2003
++++ cups-1.1.19/filter/Makefile Tue May 27 23:15:51 2003
+@@ -70,30 +70,30 @@
+ #
+
+ install: all installhdrs
- $(INSTALL_DIR) $(SERVERBIN)/filter
+ $(INSTALL_DIR) $(DESTDIR)$(SERVERBIN)/filter
for file in $(TARGETS); do \
done
- $(INSTALL_DIR) $(LIBDIR)
- $(INSTALL_LIB) $(LIBCUPSIMAGE) $(LIBDIR)
-- -if test $(LIBCUPSIMAGE) = "libcupsimage.so.2" -o $(LIBCUPSIMAGE) = "libcupsimage.sl.2"; then \
++ $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
++ $(INSTALL_LIB) $(LIBCUPSIMAGE) $(DESTDIR)$(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
++ $(RM) $(DESTDIR)$(LIBDIR)/`basename $(LIBCUPSIMAGE) .2`; \
++ $(LN) $(LIBCUPSIMAGE) $(DESTDIR)$(LIBDIR)/`basename $(LIBCUPSIMAGE) .2`; \
+ fi
+ -if test $(LIBCUPSIMAGE) = "libcupsimage.2.dylib"; then \
+- $(STRIP) -x $(LIBDIR)/$(LIBCUPSIMAGE); \
+- $(RM) $(LIBDIR)/libcupsimage.dylib; \
+- $(LN) $(LIBCUPSIMAGE) $(LIBDIR)/libcupsimage.dylib; \
++ $(STRIP) -x $(DESTDIR)$(LIBDIR)/$(LIBCUPSIMAGE); \
++ $(RM) $(DESTDIR)$(LIBDIR)/libcupsimage.dylib; \
++ $(LN) $(LIBCUPSIMAGE) $(DESTDIR)$(LIBDIR)/libcupsimage.dylib; \
+ fi
+ -if test $(LIBCUPSIMAGE) != "libcupsimage.a"; then \
+- $(INSTALL_LIB) libcupsimage.a $(LIBDIR); \
++ $(INSTALL_LIB) libcupsimage.a $(DESTDIR)$(LIBDIR); \
+ fi
+- $(RANLIB) $(LIBDIR)/libcupsimage.a
++ $(RANLIB) $(DESTDIR)$(LIBDIR)/libcupsimage.a
+
+ installhdrs:
- $(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 $(DESTDIR)$(INCLUDEDIR)/cups
+ $(INSTALL_DATA) raster.h $(DESTDIR)$(INCLUDEDIR)/cups
+
#
- # formtops
-diff -Nru cups-1.1.10/fonts/Makefile cups-1.1.10.new/fonts/Makefile
---- cups-1.1.10/fonts/Makefile Thu Jul 19 22:17:55 2001
-+++ cups-1.1.10.new/fonts/Makefile Sun Sep 2 20:04:21 2001
-@@ -64,9 +64,9 @@
+diff -urN cups-1.1.19.orig/fonts/Makefile cups-1.1.19/fonts/Makefile
+--- cups-1.1.19.orig/fonts/Makefile Tue May 27 23:14:31 2003
++++ cups-1.1.19/fonts/Makefile Tue May 27 23:15:51 2003
+@@ -51,9 +51,9 @@
#
install:
done
-diff -Nru cups-1.1.10/locale/Makefile cups-1.1.10.new/locale/Makefile
---- cups-1.1.10/locale/Makefile Wed Jun 27 23:53:15 2001
-+++ cups-1.1.10.new/locale/Makefile Sun Sep 2 19:40:12 2001
+diff -urN cups-1.1.19.orig/locale/Makefile cups-1.1.19/locale/Makefile
+--- cups-1.1.19.orig/locale/Makefile Tue May 27 23:14:31 2003
++++ cups-1.1.19/locale/Makefile Tue May 27 23:15:51 2003
@@ -50,10 +50,10 @@
#
done
-diff -Nru cups-1.1.10/man/Makefile cups-1.1.10.new/man/Makefile
---- cups-1.1.10/man/Makefile Thu Jul 19 22:17:56 2001
-+++ cups-1.1.10.new/man/Makefile Sun Sep 2 19:58:37 2001
-@@ -60,43 +60,21 @@
+diff -urN cups-1.1.19.orig/man/Makefile cups-1.1.19/man/Makefile
+--- cups-1.1.19.orig/man/Makefile Tue May 27 23:14:31 2003
++++ cups-1.1.19/man/Makefile Tue May 27 23:15:51 2003
+@@ -68,50 +68,50 @@
#
- install:
+ install: all
- $(INSTALL_DIR) $(MANDIR)/man1
+ $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man1
for file in $(MAN1); do \
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
-+ echo ".so lp.1" > $(DESTDIR)$(MANDIR)/man1/cancel.1
+ $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man5
for file in $(MAN5); do \
- $(INSTALL_MAN) $$file $(MANDIR)/man5/`basename $$file man`5; \
- $(RM) $(AMANDIR)/man$(MAN8EXT)/disable.$(MAN8EXT)
- $(LN) enable.$(MAN8EXT) $(AMANDIR)/man$(MAN8EXT)/disable.$(MAN8EXT)
- $(INSTALL_DIR) $(MANDIR)/cat1
-- for file in $(CAT1); do \
++ $(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; \
-- done
++ $(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
-- for file in $(CAT5); do \
++ $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/cat5
+ for file in $(CAT5); do \
- $(INSTALL_MAN) $$file $(MANDIR)/cat5; \
-- done
++ $(INSTALL_MAN) $$file $(DESTDIR)$(MANDIR)/cat5; \
+ done
- $(INSTALL_DIR) $(AMANDIR)/cat$(MAN8EXT)
-- for file in $(CAT8); do \
++ $(INSTALL_DIR) $(DESTDIR)$(AMANDIR)/cat$(MAN8EXT)
+ for file in $(CAT8); do \
- $(INSTALL_MAN) $$file $(AMANDIR)/cat$(MAN8EXT); \
-- done
++ $(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)
--
-+ echo ".so accept.$(MAN8EXT)" > $(DESTDIR)$(AMANDIR)/man$(MAN8EXT)/reject.$(MAN8EXT)
-+ echo ".so enable.$(MAN8EXT)" > $(DESTDIR)$(AMANDIR)/man$(MAN8EXT)/disable.$(MAN8EXT)
++ $(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); \
+diff -urN cups-1.1.19.orig/man/fr/Makefile cups-1.1.19/man/fr/Makefile
+--- cups-1.1.19.orig/man/fr/Makefile Tue May 27 23:14:31 2003
++++ cups-1.1.19/man/fr/Makefile Tue May 27 23:15:51 2003
+@@ -60,50 +60,50 @@
+ #
+
+ install: all
+- $(INSTALL_DIR) $(MANDIR)/$(LANGUAGE)/man1
++ $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/$(LANGUAGE)/man1
+ for file in $(MAN1); do \
+- $(INSTALL_MAN) $$file $(MANDIR)/$(LANGUAGE)/man1/`basename $$file man`1; \
++ $(INSTALL_MAN) $$file $(DESTDIR)$(MANDIR)/$(LANGUAGE)/man1/`basename $$file man`1; \
+ done
+- $(RM) $(MANDIR)/$(LANGUAGE)/man1/cancel.1
+- $(LN) lp.1 $(MANDIR)/$(LANGUAGE)/man1/cancel.1
+- $(INSTALL_DIR) $(PMANDIR)/fr/man3
++ $(RM) $(DESTDIR)$(MANDIR)/$(LANGUAGE)/man1/cancel.1
++ $(LN) lp.1 $(DESTDIR)$(MANDIR)/$(LANGUAGE)/man1/cancel.1
++ $(INSTALL_DIR) $(DESTDIR)$(PMANDIR)/fr/man3
+ for file in $(MAN3); do \
+- $(INSTALL_MAN) $$file $(PMANDIR)/fr/man3/`basename $$file man`3; \
++ $(INSTALL_MAN) $$file $(DESTDIR)$(PMANDIR)/fr/man3/`basename $$file man`3; \
+ done
+- $(INSTALL_DIR) $(MANDIR)/$(LANGUAGE)/man5
++ $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/$(LANGUAGE)/man5
+ for file in $(MAN5); do \
+- $(INSTALL_MAN) $$file $(MANDIR)/$(LANGUAGE)/man5/`basename $$file man`5; \
++ $(INSTALL_MAN) $$file $(DESTDIR)$(MANDIR)/$(LANGUAGE)/man5/`basename $$file man`5; \
+ done
+- $(INSTALL_DIR) $(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)
++ $(INSTALL_DIR) $(DESTDIR)$(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)
+ for file in $(MAN8); do \
+- $(INSTALL_MAN) $$file $(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/`basename $$file man`$(MAN8EXT); \
++ $(INSTALL_MAN) $$file $(DESTDIR)$(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/`basename $$file man`$(MAN8EXT); \
+ done
+- $(RM) $(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/reject.$(MAN8EXT)
+- $(LN) accept.$(MAN8EXT) $(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/reject.$(MAN8EXT)
+- $(RM) $(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/disable.$(MAN8EXT)
+- $(LN) enable.$(MAN8EXT) $(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/disable.$(MAN8EXT)
+- $(INSTALL_DIR) $(MANDIR)/$(LANGUAGE)/cat1
++ $(RM) $(DESTDIR)$(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/reject.$(MAN8EXT)
++ $(LN) accept.$(MAN8EXT) $(DESTDIR)$(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/reject.$(MAN8EXT)
++ $(RM) $(DESTDIR)$(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/disable.$(MAN8EXT)
++ $(LN) enable.$(MAN8EXT) $(DESTDIR)$(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/disable.$(MAN8EXT)
++ $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/$(LANGUAGE)/cat1
+ for file in $(CAT1); do \
+- $(INSTALL_MAN) $$file $(MANDIR)/$(LANGUAGE)/cat1; \
++ $(INSTALL_MAN) $$file $(DESTDIR)$(MANDIR)/$(LANGUAGE)/cat1; \
+ done
+- $(RM) $(MANDIR)/$(LANGUAGE)/cat1/cancel.$(CAT1EXT)
+- $(LN) lp.$(CAT1EXT) $(MANDIR)/$(LANGUAGE)/cat1/cancel.$(CAT1EXT)
+- $(INSTALL_DIR) $(PMANDIR)/fr/cat3
++ $(RM) $(DESTDIR)$(MANDIR)/$(LANGUAGE)/cat1/cancel.$(CAT1EXT)
++ $(LN) lp.$(CAT1EXT) $(DESTDIR)$(MANDIR)/$(LANGUAGE)/cat1/cancel.$(CAT1EXT)
++ $(INSTALL_DIR) $(DESTDIR)$(PMANDIR)/fr/cat3
+ for file in $(CAT3); do \
+- $(INSTALL_MAN) $$file $(PMANDIR)/fr/cat3; \
++ $(INSTALL_MAN) $$file $(DESTDIR)$(PMANDIR)/fr/cat3; \
+ done
+- $(INSTALL_DIR) $(MANDIR)/$(LANGUAGE)/cat5
++ $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/$(LANGUAGE)/cat5
+ for file in $(CAT5); do \
+- $(INSTALL_MAN) $$file $(MANDIR)/$(LANGUAGE)/cat5; \
++ $(INSTALL_MAN) $$file $(DESTDIR)$(MANDIR)/$(LANGUAGE)/cat5; \
+ done
+- $(INSTALL_DIR) $(AMANDIR)/$(LANGUAGE)/cat$(MAN8EXT)
++ $(INSTALL_DIR) $(DESTDIR)$(AMANDIR)/$(LANGUAGE)/cat$(MAN8EXT)
+ for file in $(CAT8); do \
+- $(INSTALL_MAN) $$file $(AMANDIR)/$(LANGUAGE)/cat$(MAN8EXT); \
++ $(INSTALL_MAN) $$file $(DESTDIR)$(AMANDIR)/$(LANGUAGE)/cat$(MAN8EXT); \
+ done
+- $(RM) $(AMANDIR)/$(LANGUAGE)/cat$(MAN8EXT)/reject.$(CAT8EXT)
+- $(LN) accept.$(CAT8EXT) $(AMANDIR)/$(LANGUAGE)/cat$(MAN8EXT)/reject.$(CAT8EXT)
+- $(RM) $(AMANDIR)/$(LANGUAGE)/cat$(MAN8EXT)/disable.$(CAT8EXT)
+- $(LN) enable.$(CAT8EXT) $(AMANDIR)/$(LANGUAGE)/cat$(MAN8EXT)/disable.$(CAT8EXT)
++ $(RM) $(DESTDIR)$(AMANDIR)/$(LANGUAGE)/cat$(MAN8EXT)/reject.$(CAT8EXT)
++ $(LN) accept.$(CAT8EXT) $(DESTDIR)$(AMANDIR)/$(LANGUAGE)/cat$(MAN8EXT)/reject.$(CAT8EXT)
++ $(RM) $(DESTDIR)$(AMANDIR)/$(LANGUAGE)/cat$(MAN8EXT)/disable.$(CAT8EXT)
++ $(LN) enable.$(CAT8EXT) $(DESTDIR)$(AMANDIR)/$(LANGUAGE)/cat$(MAN8EXT)/disable.$(CAT8EXT)
+
#
- # End of "$Id$".
-diff -Nru cups-1.1.10/pdftops/Makefile cups-1.1.10.new/pdftops/Makefile
---- cups-1.1.10/pdftops/Makefile Wed Jun 27 23:53:16 2001
-+++ cups-1.1.10.new/pdftops/Makefile Sun Sep 2 19:40:12 2001
-@@ -43,8 +43,8 @@
+diff -urN cups-1.1.19.orig/pdftops/Makefile cups-1.1.19/pdftops/Makefile
+--- cups-1.1.19.orig/pdftops/Makefile Tue May 27 23:14:31 2003
++++ cups-1.1.19/pdftops/Makefile Tue May 27 23:15:51 2003
+@@ -91,8 +91,8 @@
#
- install:
+ install: all
- $(INSTALL_DIR) $(SERVERBIN)/filter
- $(INSTALL_BIN) pdftops $(SERVERBIN)/filter
+ $(INSTALL_DIR) $(DESTDIR)$(SERVERBIN)/filter
#
-diff -Nru cups-1.1.10/ppd/Makefile cups-1.1.10.new/ppd/Makefile
---- cups-1.1.10/ppd/Makefile Thu Jul 19 22:17:56 2001
-+++ cups-1.1.10.new/ppd/Makefile Sun Sep 2 19:58:58 2001
+diff -urN cups-1.1.19.orig/ppd/Makefile cups-1.1.19/ppd/Makefile
+--- cups-1.1.19.orig/ppd/Makefile Tue May 27 23:14:31 2003
++++ cups-1.1.19/ppd/Makefile Tue May 27 23:15:51 2003
@@ -52,9 +52,9 @@
#
done
-diff -Nru cups-1.1.10/pstoraster/Makefile cups-1.1.10.new/pstoraster/Makefile
---- cups-1.1.10/pstoraster/Makefile Thu Jul 19 22:17:57 2001
-+++ cups-1.1.10.new/pstoraster/Makefile Sun Sep 2 19:59:30 2001
-@@ -376,11 +376,11 @@
+diff -urN cups-1.1.19.orig/scheduler/Makefile cups-1.1.19/scheduler/Makefile
+--- cups-1.1.19.orig/scheduler/Makefile Tue May 27 23:14:31 2003
++++ cups-1.1.19/scheduler/Makefile Tue May 27 23:21:03 2003
+@@ -61,17 +61,17 @@
#
- 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 -Nru cups-1.1.10/scheduler/Makefile cups-1.1.10.new/scheduler/Makefile
---- cups-1.1.10/scheduler/Makefile Mon Jul 23 20:48:52 2001
-+++ cups-1.1.10.new/scheduler/Makefile Sun Sep 2 20:00:44 2001
-@@ -52,17 +52,17 @@
- #
-
- install:
+ install: all
- $(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) -m 711 $(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) -m 710 $(REQUESTS)
+- $(INSTALL_DIR) -m 1770 $(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) -m 711 $(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
++ $(INSTALL_DIR) -m 710 $(DESTDIR)$(REQUESTS)
++ $(INSTALL_DIR) -m 1770 $(DESTDIR)$(REQUESTS)/tmp
#
-diff -Nru cups-1.1.10/systemv/Makefile cups-1.1.10.new/systemv/Makefile
---- cups-1.1.10/systemv/Makefile Fri Aug 17 16:22:55 2001
-+++ cups-1.1.10.new/systemv/Makefile Sun Sep 2 20:01:49 2001
-@@ -50,22 +50,19 @@
+diff -urN cups-1.1.19.orig/systemv/Makefile cups-1.1.19/systemv/Makefile
+--- cups-1.1.19.orig/systemv/Makefile Tue May 27 23:14:31 2003
++++ cups-1.1.19/systemv/Makefile Tue May 27 23:25:14 2003
+@@ -59,26 +59,26 @@
#
- install:
-- $(INSTALL_DIR) $(BINDIR)
+ install: all
+- $(INSTALL_DIR) $(SBINDIR)
- $(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_DIR) $(BINDIR)
- $(INSTALL_BIN) cancel $(BINDIR)
+- $(INSTALL_BIN) cupstestppd $(BINDIR)
- $(RM) $(BINDIR)/disable
- $(LN) ../sbin/accept $(BINDIR)/disable
- $(RM) $(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) lppasswd $(BINDIR)
+- -$(INSTALL_BIN) -m 4755 -o $(CUPS_USER) -g $(CUPS_GROUP) lppasswd $(BINDIR)
++ $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
+ $(INSTALL_BIN) accept $(DESTDIR)$(SBINDIR)
-+ $(LN) -sf accept $(DESTDIR)$(SBINDIR)/reject
++ $(RM) $(DESTDIR)$(SBINDIR)/reject
++ $(LN) 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_DIR) $(DESTDIR)$(BINDIR)
+ $(INSTALL_BIN) cancel $(DESTDIR)$(BINDIR)
-+ $(LN) -sf ../sbin/accept $(DESTDIR)$(BINDIR)/disable
-+ $(LN) -sf ../sbin/accept $(DESTDIR)$(BINDIR)/enable
++ $(INSTALL_BIN) cupstestppd $(DESTDIR)$(BINDIR)
++ $(RM) $(DESTDIR)$(BINDIR)/disable
++ $(LN) ../sbin/accept $(DESTDIR)$(BINDIR)/disable
++ $(RM) $(DESTDIR)$(BINDIR)/enable
++ $(LN) ../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)
++ -$(INSTALL_BIN) -m 4755 -o $(CUPS_USER) -g $(CUPS_GROUP) lppasswd $(DESTDIR)$(BINDIR)
#
-diff -Nru cups-1.1.10/templates/Makefile cups-1.1.10.new/templates/Makefile
---- cups-1.1.10/templates/Makefile Fri Aug 17 16:12:12 2001
-+++ cups-1.1.10.new/templates/Makefile Sun Sep 2 20:02:06 2001
-@@ -91,9 +91,9 @@
+diff -urN cups-1.1.19.orig/templates/Makefile cups-1.1.19/templates/Makefile
+--- cups-1.1.19.orig/templates/Makefile Tue May 27 23:14:31 2003
++++ cups-1.1.19/templates/Makefile Tue May 27 23:15:51 2003
+@@ -95,9 +95,9 @@
#
install:
- $(INSTALL_DATA) $$file $(DATADIR)/templates; \
+ $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/templates; \
done
+ cd de; $(MAKE) $(MFLAGS) install
+ cd fr; $(MAKE) $(MFLAGS) install
+diff -urN cups-1.1.19.orig/templates/de/Makefile cups-1.1.19/templates/de/Makefile
+--- cups-1.1.19.orig/templates/de/Makefile Tue May 27 23:14:31 2003
++++ cups-1.1.19/templates/de/Makefile Tue May 27 23:52:26 2003
+@@ -94,9 +94,9 @@
+ #
+
+ install:
+- $(INSTALL_DIR) $(DATADIR)/templates/de
++ $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/templates/de
+ for file in $(FILES); do \
+- $(INSTALL_DATA) $$file $(DATADIR)/templates/de; \
++ $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/templates/de; \
+ done
+
+
+diff -urN cups-1.1.19.orig/templates/fr/Makefile cups-1.1.19/templates/fr/Makefile
+--- cups-1.1.19.orig/templates/fr/Makefile Tue May 27 23:14:31 2003
++++ cups-1.1.19/templates/fr/Makefile Tue May 27 23:15:51 2003
+@@ -94,9 +94,9 @@
+ #
+
+ install:
+- $(INSTALL_DIR) $(DATADIR)/templates/fr
++ $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/templates/fr
+ for file in $(FILES); do \
+- $(INSTALL_DATA) $$file $(DATADIR)/templates/fr; \
++ $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/templates/fr; \
+ done
projects / packages / cups.git / blobdiff