[patch] swi-prolog-5.6.0-packages-portage.patch

swi-prolog-5.6.0-packages-portage.patch (text/plain), 3.17 KB, created by Keri Harris (RETIRED) on 2006-01-03 01:23:19 UTC

diff -u pl-5.6.0.orig/packages/Makefile.in pl-5.6.0/packages/Makefile.in
--- pl-5.6.0.orig/packages/Makefile.in	2005-11-13 03:15:23.000000000 +1300
+++ pl-5.6.0/packages/Makefile.in	2006-01-03 14:54:34.000000000 +1300
@@ -76,7 +76,7 @@
 
 install::
 	for p in $(PKG); do \
-	    if [ -r $$p/Makefile ]; then ( cd $$p && $(MAKE) $@ ); fi; \
+	    if [ -r $$p/Makefile ]; then $(MAKE) -C $$p $@ || exit 1; fi; \
         done
 	@echo "*** Forcing update of library index ***"
 	rm -f $(DESTDIR)$(PLLIB)/INDEX.pl
@@ -127,7 +127,7 @@
 
 check::
 	for p in $(PKG); do \
-	    if [ -r $$p/Makefile ]; then ( cd $$p && $(MAKE) $@ ); fi; \
+	    if [ -r $$p/Makefile ]; then $(MAKE) -C $$p $@ || exit 1; fi; \
         done
 
 # test environment
--- pl-5.6.0.orig/packages/db/Makefile.in	2005-12-15 04:54:38.000000000 +1300
+++ pl-5.6.0/packages/db/Makefile.in	2006-01-03 14:58:27.000000000 +1300
@@ -9,6 +9,7 @@
 PL=@PL@
 PLBASE=@PLBASE@
 PLARCH=@PLARCH@
+PKGDOC=$(PLBASE)/doc/packages
 PCEHOME=/staff/jan/src/xpce
 DESTDIR=
 
@@ -57,10 +58,16 @@
 		$(INSTALL) -m 644 $(LIBPL) $(DESTDIR)$(PLBASE)/library
 		$(PL) -f none -g make -t halt
 
+html-install::
+		mkdir -p $(DESTDIR)$(PKGDOC)
+		$(INSTALL_DATA) $(DOC).html $(DESTDIR)$(PKGDOC)
+
 uninstall:
 		(cd $(PLBASE)/library && rm -f $(LIBPL))
 		$(PL) -f none -g make -t halt
 
+check::
+
 ################################################################
 # Documentation
 ################################################################
--- pl-5.6.0.orig/packages/mp/configure.in	2004-09-22 02:28:17.000000000 +1200
+++ pl-5.6.0/packages/mp/configure.in	2006-01-03 21:51:33.000000000 +1300
@@ -68,6 +68,7 @@
 AC_MSG_RESULT("		PLSOEXT=$PLSOEXT")
 else
 PLLD=../plld.sh
+PL=../pl.sh
 fi
 
 CC=$PLLD
--- pl-5.6.0.orig/packages/mp/Makefile.in	2002-06-03 20:09:04.000000000 +1200
+++ pl-5.6.0/packages/mp/Makefile.in	2006-01-03 15:31:34.000000000 +1300
@@ -7,6 +7,7 @@
 PL=@PL@
 PLBASE=@PLBASE@
 PLARCH=@PLARCH@
+PKGDOC=$(PLBASE)/doc/packages
 
 CC=@CC@
 COFLAGS=@COFLAGS@
@@ -17,6 +18,8 @@
 LOCALLIB=@LOCALLIB@
 LIBS=@LIBS@
 
+DOC=mp
+
 LD=@LD@
 LDFLAGS=@LDSOFLAGS@
 
@@ -41,15 +44,21 @@
 		plld -nostate -o $@ $(CIFLAGS) $(LIBPL) $(MPOBJ) $(LOCALLIB) $(LIBS)
 
 install:	$(TARGETS) $(LIBPL)
-		mkdir -p $(PLBASE)/lib/$(PLARCH)
+		mkdir -p $(DESTDIR)$(PLBASE)/lib/$(PLARCH)
 		for f in $(TARGETS); do \
-		  $(INSTALL) -m 755 $$f $(PLBASE)/lib/$(PLARCH); \
+		  $(INSTALL) -m 755 $$f $(DESTDIR)$(PLBASE)/lib/$(PLARCH); \
 		done
 		for f in $(LIBPL); do \
-		  $(INSTALL) -m 644 $$f $(PLBASE)/library; \
+		  $(INSTALL) -m 644 $$f $(DESTDIR)$(PLBASE)/library; \
 		done
 		$(PL) -f none -g make -t halt
 
+html-install:
+		mkdir -p $(DESTDIR)$(PKGDOC)
+		$(INSTALL_DATA) $(DOC).html $(DESTDIR)$(PKGDOC)
+
+check::
+
 uninstall:
 		(cd $(PLBASE)/lib/$(PLARCH) && rm -f $(TARGETS))
 		(cd $(PLBASE)/library && rm -f $(LIBPL))
--- pl-5.6.0.orig/packages/semweb/Makefile.in	2005-12-24 16:05:56.000000000 +1300
+++ pl-5.6.0/packages/semweb/Makefile.in	2005-12-24 16:06:01.000000000 +1300
@@ -85,7 +85,7 @@
 rpm-install:	install
 
 html-install::
-		mkdir -p $(PKGDOC)
+		mkdir -p $(DESTDIR)$(PKGDOC)
 		$(INSTALL) -m 644 $(DOC).html $(DESTDIR)$(PKGDOC)
 		$(INSTALL) -m 644 modules.gif $(DESTDIR)$(PKGDOC)