diff -Naupr foo2zjs.orig/Makefile foo2zjs/Makefile --- foo2zjs.orig/Makefile 2006-03-24 02:29:21.000000000 -0800 +++ foo2zjs/Makefile 2006-04-01 20:01:04.000000000 -0800 @@ -7,7 +7,7 @@ VERSION=0.0 # Installation prefix... PREFIX=/usr/local -PREFIX=/usr +PREFIX=$(DESTDIR)/usr # Pathnames for this package... BIN=$(PREFIX)/bin @@ -18,7 +18,7 @@ MANDIR=$(PREFIX)/share/man DOCDIR=$(PREFIX)/share/doc/foo2zjs/ # Pathnames for referenced packages... -FOODB=/usr/share/foomatic/db/source +FOODB=$(PREFIX)/share/foomatic/db/source # User ID's LPuid=-olp @@ -155,7 +155,7 @@ ifeq ($(UNAME),Linux) endif # Compiler flags -CFLAGS += -O2 -Wall +CFLAGS ?= -O2 -Wall # # Rules to create test documents @@ -290,12 +290,14 @@ install: all install-prog install-icc2ps # On Ubunto 5.10, run "gnome-cups-manager" install-prog: + [ -d $(BIN) ] || install -d -m 755 $(BIN)/ + [ -d $(DESTDIR)/bin/ ] || install -d -m 755 $(DESTDIR)/bin/ # # Install driver, wrapper, and development tools # install -c $(PROGS) $(SHELLS) $(BIN)/ if [ "$(BINPROGS)" != "" ]; then \ - install -c $(BINPROGS) /bin/; \ + install -c $(BINPROGS) $(DESTDIR)/bin/; \ fi # # Install gamma correction files. These are just templates, @@ -321,6 +323,7 @@ install-foo: # @if [ -d $(FOODB) ]; then \ for dir in driver printer opt; do \ + [ -d $(FOODB)/$$dir/ ] || install -d -m 755 $(FOODB)/$$dir/; \ echo install -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \ install -c -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \ done \ @@ -338,10 +341,10 @@ install-foo: # # Clear foomatic cache and rebuild database if needed # - rm -rf /var/cache/foomatic/*/* - rm -f /var/cache/foomatic/printconf.pickle - if [ -d /var/cache/foomatic/compiled ]; then \ - cd /var/cache/foomatic/compiled; \ + rm -rf $(DESTDIR)/var/cache/foomatic/*/* + rm -f $(DESTDIR)/var/cache/foomatic/printconf.pickle + if [ -d $(DESTDIR)/var/cache/foomatic/compiled ]; then \ + cd $(DESTDIR)/var/cache/foomatic/compiled; \ foomatic-combo-xml -O >overview.xml; \ fi @@ -405,8 +408,8 @@ install-extra: fi; \ done -MODEL=/usr/share/cups/model -LOCALMODEL=/usr/local/share/cups/model +MODEL=$(PREFIX)/usr/share/cups/model +LOCALMODEL=$(PREFIX)/usr/share/cups/model install-ppd: # # Install PPD files for CUPS @@ -423,20 +426,13 @@ install-ppd: done; \ fi -USBDIR=/etc/hotplug/usb -UDEVDIR=/etc/udev/rules.d -RULES=hplj10xx.rules +USBDIR=$(DESTDIR)/etc/hotplug/usb install-hotplug: [ -d $(USBDIR) ] || install -d -m 755 $(USBDIR)/ install -c -m 755 hplj1000 $(USBDIR)/ ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hplj1005 ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hplj1020 - $(USBDIR)/hplj1000 install-usermap - $(USBDIR)/hplj1005 install-usermap - $(USBDIR)/hplj1020 install-usermap - if [ -d $(UDEVDIR) ]; then \ - install -c -m 644 $(RULES) $(UDEVDIR)/11-$(RULES); \ - fi + #install -c -m 755 hplj.usermap $(USBDIR)/ cups: FRC if [ -x /etc/init.d/cups ]; then \ @@ -727,7 +723,6 @@ install-doc: doc install -c -m 644 README $(DOCDIR) install -c -m 644 ChangeLog $(DOCDIR) -GROFF=/usr/local/test/bin/groff GROFF=groff manual.pdf: $(MANPAGES) -$(GROFF) -t -man $(MANPAGES) | ps2pdf - $@ diff -Naupr foo2zjs.orig/icc2ps/Makefile foo2zjs/icc2ps/Makefile --- foo2zjs.orig/icc2ps/Makefile 2003-08-07 18:38:13.000000000 -0700 +++ foo2zjs/icc2ps/Makefile 2006-04-01 19:47:52.000000000 -0800 @@ -1,10 +1,10 @@ -PREFIX= /usr +PREFIX= $(DESTDIR)/usr BIN= $(PREFIX)/bin SRC= icc2ps.c xgetopt.c LIB= cmscam97.c cmscnvrt.c cmserr.c cmsgamma.c cmsgmt.c cmsintrp.c cmsio1.c \ cmslut.c cmsmatsh.c cmsmtrx.c cmsnamed.c cmspack.c cmspcs.c cmsps2.c \ cmssamp.c cmswtpnt.c cmsxform.c -CFLAGS= -O3 +CFLAGS?= -O3 all: foo2zjs-icc2ps