--- foo2zjs.orig/Makefile	2010-04-14 01:45:39.000000000 +0400

+++ foo2zjs/Makefile	2010-04-15 10:46:17.000000000 +0400

@@ -1,6 +1,6 @@

 LANG=C

 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)

@@ -16,21 +16,23 @@

 # 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

@@ -610,12 +612,12 @@

 	#

 	# 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

+	#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:

 	#

@@ -730,7 +732,7 @@

 MODEL=$(DESTDIR)/usr/share/cups/model

 LOCALMODEL=$(DESTDIR)/usr/local/share/cups/model

 PPD=$(DESTDIR)/usr/share/ppd

-VARPPD=/var/lp/ppd

+???VARPPD=/var/lp/ppd

 install-ppd:

 	#

 	# Install PPD files for CUPS

@@ -798,9 +800,9 @@

 	$(INSTALL) -c -m 755 hplj10xx_gui.tcl $(SHAREZJS)

-USBDIR=/etc/hotplug/usb

-UDEVDIR=/etc/udev/rules.d

-LIBUDEVDIR=/lib/udev/rules.d

+USBDIR=$(DESTDIR)/etc/hotplug/usb

+UDEVDIR=$(DESTDIR)/etc/udev/rules.d

+LIBUDEVDIR=$(DESTDIR)/lib/udev/rules.d

 RULES=hplj10xx.rules

 UDEVD=/sbin/udevd

 # For FreeBSD 8.0

@@ -851,14 +853,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

@@ -902,7 +904,7 @@

 	-rm -f /etc/hotplug/usb/hplj.usermap #

 	-rm -f /etc/udev/rules.d/58-foo2zjs.rules #

 	-rm -f /sbin/foo2zjs-loadfw #

-	-rm -rf /usr/share/doc/foo2zjs/

+	-rm -rf /usr/share/doc/foo2zjs

 	-rm -f $(MANDIR)/man1/foo2zjs*.1 $(MANDIR)/man1/zjsdecode.1

 	-rm -f $(MANDIR)/man1/foo2hp*.1

 	-rm -f $(MANDIR)/man1/foo2oak*.1 $(MANDIR)/man1/oakdecode.1

@@ -913,14 +915,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