--- Makefile.orig	2011-06-09 15:07:08.000000000 +0100
+++ Makefile	2012-03-21 19:59:55.548558697 +0000
@@ -17,9 +17,7 @@
 VERSION=0.0
 
 # Installation prefix...
-PREFIX=/usr/local
-PREFIX=/usr
-PREFIX=$(DESTDIR)/usr
+PREFIX?=/usr/local
 
 # Pathnames for this package...
 BIN=$(PREFIX)/bin
@@ -31,13 +29,14 @@
 SHAREQPDL=$(PREFIX)/share/foo2qpdl
 SHARESLX=$(PREFIX)/share/foo2slx
 SHAREHC=$(PREFIX)/share/foo2hiperc
-MANDIR=$(PREFIX)/share/man
+MANDIR=$(PREFIX)/man
 DOCDIR=$(PREFIX)/share/doc/foo2zjs/
-INSTALL=install
+INSTALL?=install
+INSTALL_MAN?=install
 ROOT=root
 
 # Pathnames for referenced packages...
-FOODB=$(DESTDIR)/usr/share/foomatic/db/source
+FOODB=$(DESTDIR)$(PREFIX)/foomatic/db/source
 
 # User ID's
 LPuid=-oroot
@@ -282,7 +281,7 @@
 
 # Compiler flags
 #CFLAGS +=	-O2 -Wall -Wno-unused-but-set-variable
-CFLAGS +=	-O2 -Wall 
+CFLAGS ?=	-O2 -Wall 
 #CFLAGS +=	-g
 
 #
@@ -556,10 +555,9 @@
 #
 # Installation rules
 #
-install: all install-test install-prog install-icc2ps install-osx-hotplug \
-	    install-extra install-crd install-foo install-ppd \
-	    install-gui install-desktop install-filter \
-	    install-man install-doc
+install: all install-prog install-icc2ps \
+	    install-crd install-foo install-ppd
+
 	#
 	# If you use CUPS, then restart the spooler:
 	#	make cups
@@ -595,7 +593,7 @@
 	#
     
 
-UDEVBIN=$(DESTDIR)/bin/
+UDEVBIN=$(DESTDIR)$(PREFIX)/bin/
 
 install-prog:
 	#
@@ -625,20 +623,13 @@
 	#
 	# Remove obsolete foomatic database files from previous versions
 	#
-	rm -f $(FOODB)/opt/foo2zjs-Media.xml
-	rm -f $(FOODB)/opt/foo2zjs-PaperSize.xml
-	rm -f $(FOODB)/opt/foo2zjs-Source.xml
-	rm -f $(FOODB)/opt/foo2zjs-DitherPPI.xml
-	rm -f $(FOODB)/opt/foo2zjs-Copies.xml
-	rm -f $(FOODB)/opt/foo2zjs-Nup.xml
-	rm -f $(FOODB)/opt/foo2zjs-NupOrient.xml
-	rm -f $(FOODB)/opt/foo2*-Quality.xml
-	rm -f $(FOODB)/printer/KonicaMinolta*.xml
 	#
 	# Install current database files
 	#
+	mkdir -p $(FOODB)
 	@if [ -d $(FOODB) ]; then \
-	    for dir in driver printer opt; do \
+	    for dir in printer opt; do \
+		mkdir -p $(FOODB)/$$dir/; \
 		echo install -d $(FOODB)/$$dir/; \
 		$(INSTALL) -d $(FOODB)/$$dir/; \
 		echo install -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \
@@ -655,15 +646,6 @@
 	    echo "*** ... wherever foomatic is stashed on your machine."; \
 	    echo "***"; \
 	fi
-	#
-	# 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; \
-	    foomatic-combo-xml -O >overview.xml; \
-	fi
 
 install-icc2ps:
 	#
@@ -783,9 +765,9 @@
 	    fi; \
 	done
 
-MODEL=$(DESTDIR)/usr/share/cups/model
-LOCALMODEL=$(DESTDIR)/usr/local/share/cups/model
-PPD=$(DESTDIR)/usr/share/ppd
+MODEL=$(DESTDIR)$(PREFIX)/share/cups/model
+LOCALMODEL=$(DESTDIR)$(PREFIX)/share/cups/model
+PPD=$(DESTDIR)$(PREFIX)/ppd
 VARPPD=/var/lp/ppd
 install-ppd:
 	#
@@ -819,6 +801,7 @@
 	fi
 	#
 	export PATH=$$PATH:`pwd`:; \
+	mkdir -p $(MODEL) ; \
 	if [ -d $(MODEL) ]; then \
 	    rm -f $(MODEL)/KonicaMinolta*; \
 	    cd PPD; \
@@ -835,9 +818,9 @@
 	    done; \
 	fi
 
-APPL=$(DESTDIR)/usr/share/applications
-OLDAPPL=$(DESTDIR)/usr/share/gnome/apps/System
-PIXMAPS=$(DESTDIR)/usr/share/pixmaps
+APPL=$(DESTDIR)$(PREFIX)/share/applications
+OLDAPPL=$(DESTDIR)$(PREFIX)/share/gnome/apps/System
+PIXMAPS=$(DESTDIR)$(PREFIX)/share/pixmaps
 
 install-desktop:
 	#
@@ -1344,38 +1327,38 @@
 	#
 	# Install manual pages
 	#
-	$(INSTALL) -d -m 755 $(MANDIR)
-	$(INSTALL) -d -m 755 $(MANDIR)/man1/
-	$(INSTALL) -c -m 644 foo2zjs.1 $(MANDIR)/man1/
-	$(INSTALL) -c -m 644 foo2zjs-wrapper.1 $(MANDIR)/man1/
-	$(INSTALL) -c -m 644 zjsdecode.1 $(MANDIR)/man1/
-	$(INSTALL) -c -m 644 foo2oak.1 $(MANDIR)/man1/
-	$(INSTALL) -c -m 644 foo2oak-wrapper.1 $(MANDIR)/man1/
-	$(INSTALL) -c -m 644 oakdecode.1 $(MANDIR)/man1/
-	$(INSTALL) -c -m 644 foo2hp.1 $(MANDIR)/man1/
-	$(INSTALL) -c -m 644 foo2hp2600-wrapper.1 $(MANDIR)/man1/
-	$(INSTALL) -c -m 644 xqxdecode.1 $(MANDIR)/man1/
-	$(INSTALL) -c -m 644 foo2xqx.1 $(MANDIR)/man1/
-	$(INSTALL) -c -m 644 foo2xqx-wrapper.1 $(MANDIR)/man1/
-	$(INSTALL) -c -m 644 lavadecode.1 $(MANDIR)/man1/
-	$(INSTALL) -c -m 644 foo2lava.1 $(MANDIR)/man1/
-	$(INSTALL) -c -m 644 foo2lava-wrapper.1 $(MANDIR)/man1/
-	$(INSTALL) -c -m 644 qpdldecode.1 $(MANDIR)/man1/
-	$(INSTALL) -c -m 644 foo2qpdl.1 $(MANDIR)/man1/
-	$(INSTALL) -c -m 644 foo2qpdl-wrapper.1 $(MANDIR)/man1/
-	$(INSTALL) -c -m 644 opldecode.1 $(MANDIR)/man1/
-	$(INSTALL) -c -m 644 slxdecode.1 $(MANDIR)/man1/
-	$(INSTALL) -c -m 644 foo2slx.1 $(MANDIR)/man1/
-	$(INSTALL) -c -m 644 foo2slx-wrapper.1 $(MANDIR)/man1/
-	$(INSTALL) -c -m 644 foo2hiperc.1 $(MANDIR)/man1/
-	$(INSTALL) -c -m 644 foo2hiperc-wrapper.1 $(MANDIR)/man1/
-	$(INSTALL) -c -m 644 hipercdecode.1 $(MANDIR)/man1/
-	$(INSTALL) -c -m 644 gipddecode.1 $(MANDIR)/man1/
-	$(INSTALL) -c -m 644 hbpldecode.1 $(MANDIR)/man1/
-	$(INSTALL) -c -m 644 foo2zjs-pstops.1 $(MANDIR)/man1/
-	$(INSTALL) -c -m 644 arm2hpdl.1 $(MANDIR)/man1/
-	$(INSTALL) -c -m 644 usb_printerid.1 $(MANDIR)/man1/
-	$(INSTALL) -c -m 644 printer-profile.1 $(MANDIR)/man1/
+	$(INSTALL_MAN) -d -m 755 $(MANDIR)
+	$(INSTALL_MAN) -d -m 755 $(MANDIR)/man1/
+	$(INSTALL_MAN) -c -m 644 foo2zjs.1 $(MANDIR)/man1/
+	$(INSTALL_MAN) -c -m 644 foo2zjs-wrapper.1 $(MANDIR)/man1/
+	$(INSTALL_MAN) -c -m 644 zjsdecode.1 $(MANDIR)/man1/
+	$(INSTALL_MAN) -c -m 644 foo2oak.1 $(MANDIR)/man1/
+	$(INSTALL_MAN) -c -m 644 foo2oak-wrapper.1 $(MANDIR)/man1/
+	$(INSTALL_MAN) -c -m 644 oakdecode.1 $(MANDIR)/man1/
+	$(INSTALL_MAN) -c -m 644 foo2hp.1 $(MANDIR)/man1/
+	$(INSTALL_MAN) -c -m 644 foo2hp2600-wrapper.1 $(MANDIR)/man1/
+	$(INSTALL_MAN) -c -m 644 xqxdecode.1 $(MANDIR)/man1/
+	$(INSTALL_MAN) -c -m 644 foo2xqx.1 $(MANDIR)/man1/
+	$(INSTALL_MAN) -c -m 644 foo2xqx-wrapper.1 $(MANDIR)/man1/
+	$(INSTALL_MAN) -c -m 644 lavadecode.1 $(MANDIR)/man1/
+	$(INSTALL_MAN) -c -m 644 foo2lava.1 $(MANDIR)/man1/
+	$(INSTALL_MAN) -c -m 644 foo2lava-wrapper.1 $(MANDIR)/man1/
+	$(INSTALL_MAN) -c -m 644 qpdldecode.1 $(MANDIR)/man1/
+	$(INSTALL_MAN) -c -m 644 foo2qpdl.1 $(MANDIR)/man1/
+	$(INSTALL_MAN) -c -m 644 foo2qpdl-wrapper.1 $(MANDIR)/man1/
+	$(INSTALL_MAN) -c -m 644 opldecode.1 $(MANDIR)/man1/
+	$(INSTALL_MAN) -c -m 644 slxdecode.1 $(MANDIR)/man1/
+	$(INSTALL_MAN) -c -m 644 foo2slx.1 $(MANDIR)/man1/
+	$(INSTALL_MAN) -c -m 644 foo2slx-wrapper.1 $(MANDIR)/man1/
+	$(INSTALL_MAN) -c -m 644 foo2hiperc.1 $(MANDIR)/man1/
+	$(INSTALL_MAN) -c -m 644 foo2hiperc-wrapper.1 $(MANDIR)/man1/
+	$(INSTALL_MAN) -c -m 644 hipercdecode.1 $(MANDIR)/man1/
+	$(INSTALL_MAN) -c -m 644 gipddecode.1 $(MANDIR)/man1/
+	$(INSTALL_MAN) -c -m 644 hbpldecode.1 $(MANDIR)/man1/
+	$(INSTALL_MAN) -c -m 644 foo2zjs-pstops.1 $(MANDIR)/man1/
+	$(INSTALL_MAN) -c -m 644 arm2hpdl.1 $(MANDIR)/man1/
+	$(INSTALL_MAN) -c -m 644 usb_printerid.1 $(MANDIR)/man1/
+	$(INSTALL_MAN) -c -m 644 printer-profile.1 $(MANDIR)/man1/
 	cd icc2ps; $(MAKE) install-man
 ifeq ($(UNAME),Darwin)
 	cd osx-hotplug; $(MAKE) install-man