Attachment #44146 for bug #65156

Line 0 Link Here

(-)foo2zjs.orig/hplj.usermap (+2 lines)
	1	hplj1000 0x0003 0x03f0 0x0517 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
	2	hplj1005 0x0003 0x03f0 0x1317 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000




VERSION=0.0

# Installation prefix...
PREFIX=$(DESTDIR)/usr/local
PREFIX=$(DESTDIR)/usr

# Pathnames for this package...
BIN=$(PREFIX)/bin

DOCDIR=$(PREFIX)/share/doc/foo2zjs/

# Pathnames for referenced packages...
FOODB=$(PREFIX)/share/foomatic/db/source

# User ID's
LPuid=-olp

	endif
endif

# Compiler flags
CFLAGS +=	-O2 -Wall

#
# Rules to create test documents
#

	# On Suse 9.0, run "yast"

install-prog:
	[ -d $(BIN) ] || install -d -m 755 $(BIN)/
	#
	# Install driver, wrapper, and development tools
	#

	#
	@if [ -d $(FOODB) ]; then \
	    for dir in driver printer opt; do \
		[ -d $(FOODB)/$$dir/ ] || install -d -m 755 $(FOODB)/$$dir/; \
		echo install -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \
		install -c -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \
	    done \

	#
	# Clear foomatic cache and rebuild database if needed
	#
	rm -rf $(DESTDIR)/var/cache/foomatic/*/*
	if [ -d $(DESTDIR)/var/cache/foomatic/compiled ]; then \
	    cd $(DESTDIR)/var/cache/foomatic/compiled; \
	    foomatic-combo-xml -O >overview.xml; \
	fi


	# foo2oak ICM files (if any)
	install $(LPuid) $(LPgid) -m 775 -d $(SHAREOAK)/icm/

USBDIR=$(DESTDIR)/etc/hotplug/usb
install-hotplug:
	[ -d $(USBDIR) ] || install -d -m 755 $(USBDIR)/
	install -c -m 755 hplj1000 $(USBDIR)/
	ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hplj1005
	install -c -m 755 hplj.usermap $(USBDIR)/
	$(USBDIR)/hplj1005 install-usermap

clean:
	-rm -f foo2zjs zjsdecode

ppd:
	./getweb ppd

MODEL=$(PREFIX)/share/cups/model
install-ppd:
	#
	# Install PPD files for CUPS

	install -c -m 644 README $(DOCDIR)
	install -c -m 644 ChangeLog $(DOCDIR)

GROFF=/usr/local/test/bin/groff
GROFF=groff
manual.pdf: $(MANPAGES)
	-$(GROFF) -t -man $(MANPAGES) | ps2pdf - $@

Lines 1-10 Link Here

(-)foo2zjs.org/icc2ps/Makefile (-2 / +1 lines)
1	PREFIX= /usr	1	PREFIX= $(DESTDIR)/usr
2	BIN= $(PREFIX)/bin	2	BIN= $(PREFIX)/bin
3	SRC= icc2ps.c xgetopt.c	3	SRC= icc2ps.c xgetopt.c
4	LIB= cmscam97.c cmscnvrt.c cmserr.c cmsgamma.c cmsgmt.c cmsintrp.c cmsio1.c \	4	LIB= cmscam97.c cmscnvrt.c cmserr.c cmsgamma.c cmsgmt.c cmsintrp.c cmsio1.c \
5	cmslut.c cmsmatsh.c cmsmtrx.c cmsnamed.c cmspack.c cmspcs.c cmsps2.c \	5	cmslut.c cmsmatsh.c cmsmtrx.c cmsnamed.c cmspack.c cmspcs.c cmsps2.c \
6	cmssamp.c cmswtpnt.c cmsxform.c	6	cmssamp.c cmswtpnt.c cmsxform.c
7	CFLAGS= -O3
8		7
9	all: foo2zjs-icc2ps	8	all: foo2zjs-icc2ps
10		9

Return to bug 65156

Lines 6-13 Link Here

(-)foo2zjs.orig/Makefile (-14 / +11 lines)
6	VERSION=0.0	6	VERSION=0.0
7		7
8	# Installation prefix...	8	# Installation prefix...
9	PREFIX=/usr/local	9	PREFIX=$(DESTDIR)/usr/local
10	PREFIX=/usr	10	PREFIX=$(DESTDIR)/usr
11		11
12	# Pathnames for this package...	12	# Pathnames for this package...
13	BIN=$(PREFIX)/bin	13	BIN=$(PREFIX)/bin
Lines 17-23 Link Here
17	DOCDIR=$(PREFIX)/share/doc/foo2zjs/	17	DOCDIR=$(PREFIX)/share/doc/foo2zjs/
18		18
19	# Pathnames for referenced packages...	19	# Pathnames for referenced packages...
20	FOODB=/usr/share/foomatic/db/source	20	FOODB=$(PREFIX)/share/foomatic/db/source
21		21
22	# User ID's	22	# User ID's
23	LPuid=-olp	23	LPuid=-olp
Lines 113-121 Link Here
113	endif	113	endif
114	endif	114	endif
115		115
116	# Compiler flags
117	CFLAGS += -O2 -Wall
118
119	#	116	#
120	# Rules to create test documents	117	# Rules to create test documents
121	#	118	#
Lines 210-215 Link Here
210	# On Suse 9.0, run "yast"	207	# On Suse 9.0, run "yast"
211		208
212	install-prog:	209	install-prog:
		210	[ -d $(BIN) ] \|\| install -d -m 755 $(BIN)/
213	#	211	#
214	# Install driver, wrapper, and development tools	212	# Install driver, wrapper, and development tools
215	#	213	#
Lines 237-242 Link Here
237	#	235	#
238	@if [ -d $(FOODB) ]; then \	236	@if [ -d $(FOODB) ]; then \
239	for dir in driver printer opt; do \	237	for dir in driver printer opt; do \
		238	[ -d $(FOODB)/$$dir/ ] \|\| install -d -m 755 $(FOODB)/$$dir/; \
240	echo install -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \	239	echo install -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \
241	install -c -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \	240	install -c -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \
242	done \	241	done \
Lines 254-262 Link Here
254	#	253	#
255	# Clear foomatic cache and rebuild database if needed	254	# Clear foomatic cache and rebuild database if needed
256	#	255	#
257	rm -rf /var/cache/foomatic//	256	rm -rf $(DESTDIR)/var/cache/foomatic//
258	if [ -d /var/cache/foomatic/compiled ]; then \	257	if [ -d $(DESTDIR)/var/cache/foomatic/compiled ]; then \
259	cd /var/cache/foomatic/compiled; \	258	cd $(DESTDIR)/var/cache/foomatic/compiled; \
260	foomatic-combo-xml -O >overview.xml; \	259	foomatic-combo-xml -O >overview.xml; \
261	fi	260	fi
262		261
Lines 303-315 Link Here
303	# foo2oak ICM files (if any)	302	# foo2oak ICM files (if any)
304	install $(LPuid) $(LPgid) -m 775 -d $(SHAREOAK)/icm/	303	install $(LPuid) $(LPgid) -m 775 -d $(SHAREOAK)/icm/
305		304
306	USBDIR=/etc/hotplug/usb	305	USBDIR=$(DESTDIR)/etc/hotplug/usb
307	install-hotplug:	306	install-hotplug:
308	[ -d $(USBDIR) ] \|\| install -d -m 755 $(USBDIR)/	307	[ -d $(USBDIR) ] \|\| install -d -m 755 $(USBDIR)/
309	install -c -m 755 hplj1000 $(USBDIR)/	308	install -c -m 755 hplj1000 $(USBDIR)/
310	ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hplj1005	309	ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hplj1005
311	$(USBDIR)/hplj1000 install-usermap	310	install -c -m 755 hplj.usermap $(USBDIR)/
312	$(USBDIR)/hplj1005 install-usermap
313		311
314	clean:	312	clean:
315	-rm -f foo2zjs zjsdecode	313	-rm -f foo2zjs zjsdecode
Lines 461-467 Link Here
461	ppd:	459	ppd:
462	./getweb ppd	460	./getweb ppd
463		461
464	MODEL=/usr/share/cups/model	462	MODEL=$(PREFIX)/share/cups/model
465	install-ppd:	463	install-ppd:
466	#	464	#
467	# Install PPD files for CUPS	465	# Install PPD files for CUPS
Lines 518-524 Link Here
518	install -c -m 644 README $(DOCDIR)	516	install -c -m 644 README $(DOCDIR)
519	install -c -m 644 ChangeLog $(DOCDIR)	517	install -c -m 644 ChangeLog $(DOCDIR)
520		518
521	GROFF=/usr/local/test/bin/groff
522	GROFF=groff	519	GROFF=groff
523	manual.pdf: $(MANPAGES)	520	manual.pdf: $(MANPAGES)
524	-$(GROFF) -t -man $(MANPAGES) \| ps2pdf - $@	521	-$(GROFF) -t -man $(MANPAGES) \| ps2pdf - $@