Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 263494 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-46 / +34 lines)
Lines 21-26 Link Here
21
PREFIX=/usr
21
PREFIX=/usr
22
PREFIX=$(DESTDIR)/usr
22
PREFIX=$(DESTDIR)/usr
23
23
24
# USB_PRINTERID is also installed there because it is needed by the FWloader
25
FWLOADERDIR=$(DESTDIR)/sbin
26
FIRMWAREDIR=$(DESTDIR)/lib/firmware
27
24
# Pathnames for this package...
28
# Pathnames for this package...
25
BIN=$(PREFIX)/bin
29
BIN=$(PREFIX)/bin
26
SHAREZJS=$(PREFIX)/share/foo2zjs
30
SHAREZJS=$(PREFIX)/share/foo2zjs
Lines 577-582 Link Here
577
	#
581
	#
578
	# Remove obsolete foomatic database files from previous versions
582
	# Remove obsolete foomatic database files from previous versions
579
	#
583
	#
584
	mkdir -p $(FOODB)/opt/
580
	rm -f $(FOODB)/opt/foo2zjs-Media.xml
585
	rm -f $(FOODB)/opt/foo2zjs-Media.xml
581
	rm -f $(FOODB)/opt/foo2zjs-PaperSize.xml
586
	rm -f $(FOODB)/opt/foo2zjs-PaperSize.xml
582
	rm -f $(FOODB)/opt/foo2zjs-Source.xml
587
	rm -f $(FOODB)/opt/foo2zjs-Source.xml
Lines 610-619 Link Here
610
	#
615
	#
611
	# Clear foomatic cache and rebuild database if needed
616
	# Clear foomatic cache and rebuild database if needed
612
	#
617
	#
613
	rm -rf /var/cache/foomatic/*/*
618
	rm -rf $(DESTDIR)/var/cache/foomatic/*/*
614
	rm -f /var/cache/foomatic/printconf.pickle
619
	rm -f $(DESTDIR)/var/cache/foomatic/printconf.pickle
615
	if [ -d /var/cache/foomatic/compiled ]; then \
620
	if [ -d $(DESTDIR)/var/cache/foomatic/compiled ]; then \
616
	    cd /var/cache/foomatic/compiled; \
621
	    cd $(DESTDIR)/var/cache/foomatic/compiled; \
617
	    foomatic-combo-xml -O >overview.xml; \
622
	    foomatic-combo-xml -O >overview.xml; \
618
	fi
623
	fi
619
624
Lines 660-729 Link Here
660
	#
665
	#
661
	$(INSTALL) -d $(SHAREZJS)/
666
	$(INSTALL) -d $(SHAREZJS)/
662
	# foo2zjs ICM files (if any)
667
	# foo2zjs ICM files (if any)
663
	$(INSTALL) $(LPuid) $(LPgid) -m 775 -d $(SHAREZJS)/icm/
668
	$(INSTALL) $(LPuid) $(LPgid) -m 775 -d $(FIRMWAREDIR)/
664
	for i in DL*.icm CP*.icm km2430*.icm; do \
669
	for i in DL*.icm CP*.icm km2430*.icm; do \
665
	    if [ -f $$i ]; then \
670
	    if [ -f $$i ]; then \
666
		$(INSTALL) -c -m 644 $$i $(SHAREZJS)/icm/; \
671
		$(INSTALL) -c -m 644 $$i $(FIRMWAREDIR)/; \
667
	    fi; \
672
	    fi; \
668
	done
673
	done
669
	# foo2zjs Firmware files (if any)
674
	# foo2zjs Firmware files (if any)
670
	$(INSTALL) $(LPuid) $(LPgid) -m 775 -d $(SHAREZJS)/firmware/
675
	$(INSTALL) $(LPuid) $(LPgid) -m 775 -d $(FIRMWAREDIR)/
671
	for i in sihp1*.img; do \
676
	for i in sihp1*.img; do \
672
	    if [ -f $$i ]; then \
677
	    if [ -f $$i ]; then \
673
		base=`basename $$i .img`; \
678
		base=`basename $$i .img`; \
674
		./arm2hpdl $$i >$$base.dl; \
679
		./arm2hpdl $$i >$$base.dl; \
675
		$(INSTALL) -c -m 644 $$base.dl $(SHAREZJS)/firmware/; \
680
		$(INSTALL) -c -m 644 $$base.dl $(FIRMWAREDIR)/; \
676
	    fi; \
681
	    fi; \
677
	done
682
	done
678
	# foo2xqx Firmware files (if any)
683
	# foo2xqx Firmware files (if any)
679
	$(INSTALL) $(LPuid) $(LPgid) -m 775 -d $(SHAREXQX)/firmware/
684
	$(INSTALL) $(LPuid) $(LPgid) -m 775 -d $(FIRMWAREDIR)/
680
	for i in sihpP*.img; do \
685
	for i in sihpP*.img; do \
681
	    if [ -f $$i ]; then \
686
	    if [ -f $$i ]; then \
682
		base=`basename $$i .img`; \
687
		base=`basename $$i .img`; \
683
		./arm2hpdl $$i >$$base.dl; \
688
		./arm2hpdl $$i >$$base.dl; \
684
		$(INSTALL) -c -m 644 $$base.dl $(SHAREXQX)/firmware/; \
689
		$(INSTALL) -c -m 644 $$base.dl $(FIRMWAREDIR)/; \
685
	    fi; \
690
	    fi; \
686
	done
691
	done
687
	# foo2oak ICM files (if any)
692
	# foo2oak ICM files (if any)
688
	$(INSTALL) $(LPuid) $(LPgid) -m 775 -d $(SHAREOAK)/icm/
693
	$(INSTALL) $(LPuid) $(LPgid) -m 775 -d $(FIRMWAREDIR)/
689
	for i in hpclj26*.icm; do \
694
	for i in hpclj26*.icm; do \
690
	    if [ -f $$i ]; then \
695
	    if [ -f $$i ]; then \
691
		$(INSTALL) -c -m 644 $$i $(SHAREOAK)/icm/; \
696
		$(INSTALL) -c -m 644 $$i $(FIRMWAREDIR)/; \
692
	    fi; \
697
	    fi; \
693
	done
698
	done
694
	# foo2hp ICM files (if any)
699
	# foo2hp ICM files (if any)
695
	$(INSTALL) $(LPuid) $(LPgid) -m 775 -d $(SHAREHP)/icm/
700
	$(INSTALL) $(LPuid) $(LPgid) -m 775 -d $(FIRMWAREDIR)/
696
	for i in hpclj26*.icm km2430*.icm hp1215*.icm; do \
701
	for i in hpclj26*.icm km2430*.icm hp1215*.icm; do \
697
	    if [ -f $$i ]; then \
702
	    if [ -f $$i ]; then \
698
		$(INSTALL) -c -m 644 $$i $(SHAREHP)/icm/; \
703
		$(INSTALL) -c -m 644 $$i $(FIRMWAREDIR)/; \
699
	    fi; \
704
	    fi; \
700
	done
705
	done
701
	# foo2lava ICM files (if any)
706
	# foo2lava ICM files (if any)
702
	$(INSTALL) $(LPuid) $(LPgid) -m 775 -d $(SHARELAVA)/icm/
707
	$(INSTALL) $(LPuid) $(LPgid) -m 775 -d $(FIRMWAREDIR)/
703
	for i in km-1600*.icm km2530*.icm; do \
708
	for i in km-1600*.icm km2530*.icm; do \
704
	    if [ -f $$i ]; then \
709
	    if [ -f $$i ]; then \
705
		$(INSTALL) -c -m 644 $$i $(SHARELAVA)/icm/; \
710
		$(INSTALL) -c -m 644 $$i $(FIRMWAREDIR)/; \
706
	    fi; \
711
	    fi; \
707
	done
712
	done
708
	# foo2qpdl ICM files (if any)
713
	# foo2qpdl ICM files (if any)
709
	$(INSTALL) $(LPuid) $(LPgid) -m 775 -d $(SHAREQPDL)/icm/
714
	$(INSTALL) $(LPuid) $(LPgid) -m 775 -d $(FIRMWAREDIR)/
710
	for i in samclp*.icm; do \
715
	for i in samclp*.icm; do \
711
	    if [ -f $$i ]; then \
716
	    if [ -f $$i ]; then \
712
		$(INSTALL) -c -m 644 $$i $(SHAREQPDL)/icm/; \
717
		$(INSTALL) -c -m 644 $$i $(FIRMWAREDIR)/; \
713
	    fi; \
718
	    fi; \
714
	done
719
	done
715
	# foo2slx ICM files (if any)
720
	# foo2slx ICM files (if any)
716
	$(INSTALL) $(LPuid) $(LPgid) -m 775 -d $(SHARESLX)/icm/
721
	$(INSTALL) $(LPuid) $(LPgid) -m 775 -d $(FIRMWAREDIR)/
717
	for i in lex*.icm; do \
722
	for i in lex*.icm; do \
718
	    if [ -f $$i ]; then \
723
	    if [ -f $$i ]; then \
719
		$(INSTALL) -c -m 644 $$i $(SHARESLX)/icm/; \
724
		$(INSTALL) -c -m 644 $$i $(FIRMWAREDIR)/; \
720
	    fi; \
725
	    fi; \
721
	done
726
	done
722
	# foo2hiperc ICM files (if any)
727
	# foo2hiperc ICM files (if any)
723
	$(INSTALL) $(LPuid) $(LPgid) -m 775 -d $(SHAREHC)/icm/
728
	$(INSTALL) $(LPuid) $(LPgid) -m 775 -d $(FIRMWAREDIR)/
724
	for i in OK*.icm C3400*.icm; do \
729
	for i in OK*.icm C3400*.icm; do \
725
	    if [ -f $$i ]; then \
730
	    if [ -f $$i ]; then \
726
		$(INSTALL) -c -m 644 $$i $(SHAREHC)/icm/; \
731
		$(INSTALL) -c -m 644 $$i $(FIRMWAREDIR)/; \
727
	    fi; \
732
	    fi; \
728
	done
733
	done
729
734
Lines 745-757 Link Here
745
	    done; \
750
	    done; \
746
	    ppdmgr -u; \
751
	    ppdmgr -u; \
747
	elif [ -d $(PPD) ]; then \
752
	elif [ -d $(PPD) ]; then \
748
	    find $(PPD) -name '*foo2zjs*' | xargs rm -rf; \
749
	    find $(PPD) -name '*foo2hp*' | xargs rm -rf; \
750
	    find $(PPD) -name '*foo2xqx*' | xargs rm -rf; \
751
	    find $(PPD) -name '*foo2lava*' | xargs rm -rf; \
752
	    find $(PPD) -name '*foo2qpdl*' | xargs rm -rf; \
753
	    find $(PPD) -name '*foo2slx*' | xargs rm -rf; \
754
	    find $(PPD) -name '*foo2hiperc*' | xargs rm -rf; \
755
            [ -d $(PPD)/foo2zjs ] || mkdir $(PPD)/foo2zjs; \
753
            [ -d $(PPD)/foo2zjs ] || mkdir $(PPD)/foo2zjs; \
756
	    cd PPD; \
754
	    cd PPD; \
757
	    for ppd in *.ppd; do \
755
	    for ppd in *.ppd; do \
Lines 798-810 Link Here
798
	$(INSTALL) -c -m 755 hplj10xx_gui.tcl $(SHAREZJS)
796
	$(INSTALL) -c -m 755 hplj10xx_gui.tcl $(SHAREZJS)
799
	
797
	
800
798
801
USBDIR=/etc/hotplug/usb
799
USBDIR=$(DESTDIR)/etc/hotplug/usb
802
UDEVDIR=/etc/udev/rules.d
800
UDEVDIR=$(DESTDIR)/etc/udev/rules.d
803
LIBUDEVDIR=/lib/udev/rules.d
801
LIBUDEVDIR=$(DESTDIR)/lib/udev/rules.d
804
RULES=hplj10xx.rules
802
RULES=hplj10xx.rules
805
UDEVD=/sbin/udevd
803
UDEVD=/sbin/udevd
806
# For FreeBSD 8.0
804
# For FreeBSD 8.0
807
DEVDDIR=/etc/devd
805
DEVDDIR=$(DESTDIR)/etc/devd
808
806
809
install-hotplug: install-hotplug-test install-hotplug-prog
807
install-hotplug: install-hotplug-test install-hotplug-prog
810
808
Lines 835-842 Link Here
835
	#
833
	#
836
834
837
install-hotplug-prog:
835
install-hotplug-prog:
836
	[ -d $(FWLOADERDIR) ] || install -d -m 755 $(FWLOADERDIR)/
837
	install -c -m 755 foo2zjs-loadfw $(FWLOADERDIR)/
838
	[ -d $(UDEVDIR) ] || install -d -m 755 $(UDEVDIR)/
838
	if [ -d $(UDEVDIR) ]; then \
839
	if [ -d $(UDEVDIR) ]; then \
839
	    rm -f /lib/udev/rules.d/*-hplj10xx.rules; \
840
	    version=`$(UDEVD) --version 2>/dev/null`; \
840
	    version=`$(UDEVD) --version 2>/dev/null`; \
841
	    if [ "$$version" = "" ]; then version=0; fi; \
841
	    if [ "$$version" = "" ]; then version=0; fi; \
842
	    echo "*** udev version $$version"; \
842
	    echo "*** udev version $$version"; \
Lines 859-875 Link Here
859
	ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hpljP1007
859
	ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hpljP1007
860
	ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hpljP1008
860
	ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hpljP1008
861
	ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hpljP1505
861
	ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hpljP1505
862
	$(USBDIR)/hplj1000 install-usermap
863
	$(USBDIR)/hplj1005 install-usermap
864
	$(USBDIR)/hplj1018 install-usermap
865
	$(USBDIR)/hplj1020 install-usermap
866
	$(USBDIR)/hpljP1005 install-usermap
867
	$(USBDIR)/hpljP1006 install-usermap
868
	$(USBDIR)/hpljP1007 install-usermap
869
	$(USBDIR)/hpljP1008 install-usermap
870
	$(USBDIR)/hpljP1505 install-usermap
871
	# modprobe usblp
872
	$(USBDIR)/hplj1000 install-usblp
873
862
874
cups:	FRC
863
cups:	FRC
875
	if [ -x /etc/init.d/cups ]; then \
864
	if [ -x /etc/init.d/cups ]; then \
Lines 1272-1278 Link Here
1272
	$(INSTALL) -c -m 644 README $(DOCDIR)
1261
	$(INSTALL) -c -m 644 README $(DOCDIR)
1273
	$(INSTALL) -c -m 644 ChangeLog $(DOCDIR)
1262
	$(INSTALL) -c -m 644 ChangeLog $(DOCDIR)
1274
1263
1275
GROFF=/usr/local/test/bin/groff
1276
GROFF=groff
1264
GROFF=groff
1277
manual.pdf: $(MANPAGES)
1265
manual.pdf: $(MANPAGES)
1278
	-$(GROFF) -t -man $(MANPAGES) | ps2pdf - $@
1266
	-$(GROFF) -t -man $(MANPAGES) | ps2pdf - $@

Return to bug 263494