Attachment #76042 for bug #116567

View | Details | Raw Unified | Return to bug 116567 | Differences between

and this patch

Lines 76-82 Link Here

(-)pl-5.6.0.orig/packages/Makefile.in (-2 / +2 lines)
76		76
77	install::	77	install::
78	for p in $(PKG); do \	78	for p in $(PKG); do \
79	if [ -r $$p/Makefile ]; then ( cd $$p && $(MAKE) $@ ); fi; \	79	if [ -r $$p/Makefile ]; then $(MAKE) -C $$p $@ \|\| exit 1; fi; \
80	done	80	done
81	@echo "* Forcing update of library index *"	81	@echo "* Forcing update of library index *"
82	rm -f $(DESTDIR)$(PLLIB)/INDEX.pl	82	rm -f $(DESTDIR)$(PLLIB)/INDEX.pl
Lines 127-133 Link Here
127		127
128	check::	128	check::
129	for p in $(PKG); do \	129	for p in $(PKG); do \
130	if [ -r $$p/Makefile ]; then ( cd $$p && $(MAKE) $@ ); fi; \	130	if [ -r $$p/Makefile ]; then $(MAKE) -C $$p $@ \|\| exit 1; fi; \
131	done	131	done
132		132
133	# test environment	133	# test environment

Lines 9-14 Link Here

(-)pl-5.6.0.orig/packages/db/Makefile.in (+7 lines)
9	PL=@PL@	9	PL=@PL@
10	PLBASE=@PLBASE@	10	PLBASE=@PLBASE@
11	PLARCH=@PLARCH@	11	PLARCH=@PLARCH@
		12	PKGDOC=$(PLBASE)/doc/packages
12	PCEHOME=/staff/jan/src/xpce	13	PCEHOME=/staff/jan/src/xpce
13	DESTDIR=	14	DESTDIR=
14		15
Lines 57-66 Link Here
57	$(INSTALL) -m 644 $(LIBPL) $(DESTDIR)$(PLBASE)/library	58	$(INSTALL) -m 644 $(LIBPL) $(DESTDIR)$(PLBASE)/library
58	$(PL) -f none -g make -t halt	59	$(PL) -f none -g make -t halt
59		60
		61	html-install::
		62	mkdir -p $(DESTDIR)$(PKGDOC)
		63	$(INSTALL_DATA) $(DOC).html $(DESTDIR)$(PKGDOC)
		64
60	uninstall:	65	uninstall:
61	(cd $(PLBASE)/library && rm -f $(LIBPL))	66	(cd $(PLBASE)/library && rm -f $(LIBPL))
62	$(PL) -f none -g make -t halt	67	$(PL) -f none -g make -t halt
63		68
		69	check::
		70
64	################################################################	71	################################################################
65	# Documentation	72	# Documentation
66	################################################################	73	################################################################

Lines 7-12 Link Here

(-)pl-5.6.0.orig/packages/mp/Makefile.in (-3 / +12 lines)
7	PL=@PL@	7	PL=@PL@
8	PLBASE=@PLBASE@	8	PLBASE=@PLBASE@
9	PLARCH=@PLARCH@	9	PLARCH=@PLARCH@
		10	PKGDOC=$(PLBASE)/doc/packages
10		11
11	CC=@CC@	12	CC=@CC@
12	COFLAGS=@COFLAGS@	13	COFLAGS=@COFLAGS@
Lines 17-22 Link Here
17	LOCALLIB=@LOCALLIB@	18	LOCALLIB=@LOCALLIB@
18	LIBS=@LIBS@	19	LIBS=@LIBS@
19		20
		21	DOC=mp
		22
20	LD=@LD@	23	LD=@LD@
21	LDFLAGS=@LDSOFLAGS@	24	LDFLAGS=@LDSOFLAGS@
22		25
Lines 41-55 Link Here
41	plld -nostate -o $@ $(CIFLAGS) $(LIBPL) $(MPOBJ) $(LOCALLIB) $(LIBS)	44	plld -nostate -o $@ $(CIFLAGS) $(LIBPL) $(MPOBJ) $(LOCALLIB) $(LIBS)
42		45
43	install: $(TARGETS) $(LIBPL)	46	install: $(TARGETS) $(LIBPL)
44	mkdir -p $(PLBASE)/lib/$(PLARCH)	47	mkdir -p $(DESTDIR)$(PLBASE)/lib/$(PLARCH)
45	for f in $(TARGETS); do \	48	for f in $(TARGETS); do \
46	$(INSTALL) -m 755 $$f $(PLBASE)/lib/$(PLARCH); \	49	$(INSTALL) -m 755 $$f $(DESTDIR)$(PLBASE)/lib/$(PLARCH); \
47	done	50	done
48	for f in $(LIBPL); do \	51	for f in $(LIBPL); do \
49	$(INSTALL) -m 644 $$f $(PLBASE)/library; \	52	$(INSTALL) -m 644 $$f $(DESTDIR)$(PLBASE)/library; \
50	done	53	done
51	$(PL) -f none -g make -t halt	54	$(PL) -f none -g make -t halt
52		55
		56	html-install:
		57	mkdir -p $(DESTDIR)$(PKGDOC)
		58	$(INSTALL_DATA) $(DOC).html $(DESTDIR)$(PKGDOC)
		59
		60	check::
		61
53	uninstall:	62	uninstall:
54	(cd $(PLBASE)/lib/$(PLARCH) && rm -f $(TARGETS))	63	(cd $(PLBASE)/lib/$(PLARCH) && rm -f $(TARGETS))
55	(cd $(PLBASE)/library && rm -f $(LIBPL))	64	(cd $(PLBASE)/library && rm -f $(LIBPL))

Lines 85-91 Link Here

(-)pl-5.6.0.orig/packages/semweb/Makefile.in (-1 / +1 lines)
85	rpm-install: install	85	rpm-install: install
86		86
87	html-install::	87	html-install::
88	mkdir -p $(PKGDOC)	88	mkdir -p $(DESTDIR)$(PKGDOC)
89	$(INSTALL) -m 644 $(DOC).html $(DESTDIR)$(PKGDOC)	89	$(INSTALL) -m 644 $(DOC).html $(DESTDIR)$(PKGDOC)
90	$(INSTALL) -m 644 modules.gif $(DESTDIR)$(PKGDOC)	90	$(INSTALL) -m 644 modules.gif $(DESTDIR)$(PKGDOC)
91		91

Return to bug 116567