--- foo2zjs.orig/Makefile	2008-09-23 17:56:20 +0400
+++ foo2zjs/Makefile	2008-09-25 10:11:01 +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,9 +15,11 @@
 # No version number yet...
 VERSION=0.0
 
+# (fake) Installation root...
+DESTDIR=
+
 # Installation prefix...
 PREFIX=/usr/local
-PREFIX=/usr
 PREFIX=$(DESTDIR)/usr
 
 # Pathnames for this package...
@@ -550,7 +552,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 +600,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 +782,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 +808,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