--- foo2zjs.orig/Makefile	2008-09-23 17:56:20 +0400
+++ foo2zjs/Makefile	2008-09-29 08:31:00 +0400
@@ -1,5 +1,5 @@
 UNAME := $(shell uname)
-MACH := $(shell uname -m | sed 's/i.86/x86_32/')
+MACH := $(shell uname -m | sed 's/i.86/x86_32/' | sed 's/athlon/x86_32/')
 
 ifeq ($(UNAME),SunOS)
     EUID := $(shell /usr/xpg4/bin/id -u)
@@ -15,21 +15,24 @@
 # No version number yet...
 VERSION=0.0
 
+# (fake) Installation root...
+DESTDIR=
+
 # Installation prefix...
 PREFIX=/usr/local
-PREFIX=/usr
 PREFIX=$(DESTDIR)/usr
+SHAREPREFIX=$(DESTDIR)/var/lib
 
 # Pathnames for this package...
 BIN=$(PREFIX)/bin
-SHAREZJS=$(PREFIX)/share/foo2zjs
-SHAREOAK=$(PREFIX)/share/foo2oak
-SHAREHP=$(PREFIX)/share/foo2hp
-SHAREXQX=$(PREFIX)/share/foo2xqx
-SHARELAVA=$(PREFIX)/share/foo2lava
-SHAREQPDL=$(PREFIX)/share/foo2qpdl
-SHARESLX=$(PREFIX)/share/foo2slx
-SHAREHC=$(PREFIX)/share/foo2hiperc
+SHAREZJS=$(SHAREPREFIX)/foo2zjs
+SHAREOAK=$(SHAREPREFIX)/foo2oak
+SHAREHP=$(SHAREPREFIX)/foo2hp
+SHAREXQX=$(SHAREPREFIX)/foo2xqx
+SHARELAVA=$(SHAREPREFIX)/foo2lava
+SHAREQPDL=$(SHAREPREFIX)/foo2qpdl
+SHARESLX=$(SHAREPREFIX)/foo2slx
+SHAREHC=$(SHAREPREFIX)/foo2hiperc
 MANDIR=$(PREFIX)/share/man
 DOCDIR=$(PREFIX)/share/doc/foo2zjs/
 INSTALL=install
@@ -550,7 +553,7 @@
 	$(INSTALL) -c $(PROGS) $(SHELLS) $(BIN)/
 	if [ "$(BINPROGS)" != "" ]; then \
 	    $(INSTALL) -d $(UDEVBIN); \
-	    $(INSTALL) -c $(BINPROGS) $(UDEVBIN); \
+	    $(INSTALL) -c $(BINPROGS) $(DESTDIR)/bin/; \
 	fi
 	#
 	# Install gamma correction files.  These are just templates,
@@ -598,15 +601,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:
 	#
@@ -789,8 +783,8 @@
 	$(INSTALL) -c -m 755 hplj10xx_gui.tcl $(SHAREZJS)
 	
 
-USBDIR=/etc/hotplug/usb
-UDEVDIR=/etc/udev/rules.d
+USBDIR=$(DESTDIR)/etc/hotplug/usb
+UDEVDIR=$(DESTDIR)/etc/udev/rules.d
 RULES=hplj10xx.rules
 install-hotplug: install-hotplug-test install-hotplug-prog
 
@@ -815,14 +809,14 @@
 	fi
 	[ -d $(USBDIR) ] || $(INSTALL) -d -m 755 $(USBDIR)/
 	$(INSTALL) -c -m 755 hplj1000 $(USBDIR)/
-	ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hplj1005
-	ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hplj1018
-	ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hplj1020
-	ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hpljP1005
-	ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hpljP1006
-	ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hpljP1007
-	ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hpljP1008
-	ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hpljP1505
+	ln -sf hplj1000 $(USBDIR)/hplj1005
+	ln -sf hplj1000 $(USBDIR)/hplj1018
+	ln -sf hplj1000 $(USBDIR)/hplj1020
+	ln -sf hplj1000 $(USBDIR)/hpljP1005
+	ln -sf hplj1000 $(USBDIR)/hpljP1006
+	ln -sf hplj1000 $(USBDIR)/hpljP1007
+	ln -sf hplj1000 $(USBDIR)/hpljP1008
+	ln -sf hplj1000 $(USBDIR)/hpljP1505
 	$(USBDIR)/hplj1000 install-usermap
 	$(USBDIR)/hplj1005 install-usermap
 	$(USBDIR)/hplj1018 install-usermap
@@ -875,14 +869,14 @@
 	-rm -f $(MANDIR)/man1/opldecode.1 $(MANDIR)/man1/rodecode.1
 	-rm -f $(MANDIR)/man1/foo2hiperc*.1 $(MANDIR)/man1/hipercdecode.1
 	-rm -f $(MANDIR)/man1/arm2hpdl.1 $(MANDIR)/man1/usb_printerid.1
-	-rm -rf /usr/share/foo2zjs/
-	-rm -rf /usr/share/foo2hp/
-	-rm -rf /usr/share/foo2oak/
-	-rm -rf /usr/share/foo2xqx/
-	-rm -rf /usr/share/foo2lava/
-	-rm -rf /usr/share/foo2qpdl/
-	-rm -rf /usr/share/foo2slx/
-	-rm -rf /usr/share/foo2hiperc/
+	-rm -rf $(SHAREZJS)/foo2zjs/
+	-rm -rf $(SHAREHP)/foo2hp/
+	-rm -rf $(SHAREOAK)/foo2oak/
+	-rm -rf $(SHAREXQX)/foo2xqx/
+	-rm -rf $(SHARELAVA)/foo2lava/
+	-rm -rf $(SHAREQPDL)/foo2qpdl/
+	-rm -rf $(SHARESLX)/foo2slx/
+	-rm -rf $(SHAREHC)/foo2hiperc/
 	-rm -f /usr/bin/arm2hpdl
 	-rm -f /usr/bin/foo2zjs-wrapper /usr/bin/foo2zjs /usr/bin/zjsdecode
 	-rm -f /usr/bin/foo2oak-wrapper /usr/bin/foo2oak /usr/bin/oakdecode