--- foo2zjs.orig/Makefile	2008-06-05 16:22:39 +0400
+++ foo2zjs/Makefile	2008-06-09 11:21:09 +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,12 @@
 # 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...
 BIN=$(PREFIX)/bin
@@ -34,7 +37,7 @@
 INSTALL=install
 
 # Pathnames for referenced packages...
-FOODB=/usr/share/foomatic/db/source
+FOODB=$(PREFIX)/share/foomatic/db/source
 
 # User ID's
 LPuid=-olp
@@ -545,7 +548,7 @@
 	#
 	$(INSTALL) -c $(PROGS) $(SHELLS) $(BIN)/
 	if [ "$(BINPROGS)" != "" ]; then \
-	    $(INSTALL) -c $(BINPROGS) $(UDEVBIN); \
+	    $(INSTALL) -c $(BINPROGS) $(DESTDIR)/bin/; \
 	fi
 	#
 	# Install gamma correction files.  These are just templates,
@@ -593,15 +596,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:
 	#
@@ -713,7 +707,7 @@
 	    fi; \
 	done
 
-MODEL=/usr/share/cups/model
+MODEL=$(DESTDIR)/usr/share/cups/model
 LOCALMODEL=/usr/local/share/cups/model
 PPD=/usr/share/ppd
 VARPPD=/var/lp/ppd
@@ -758,9 +752,9 @@
 	    done; \
 	fi
 
-APPL=/usr/share/applications
+APPL=$(DESTDIR)/usr/share/applications
 OLDAPPL=/usr/share/gnome/apps/System
-PIXMAPS=/usr/share/pixmaps
+PIXMAPS=$(DESTDIR)/usr/share/pixmaps
 install-desktop:
 	#
 	# Install GNOME desktop
@@ -783,8 +777,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
 
@@ -809,14 +803,15 @@
 	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