From d93b24920db7814bbbb3bdd564b11cb71d70caf9 Mon Sep 17 00:00:00 2001
From: Vitor Santos Costa <vsc@dcc.fc.up.pt>
Date: Fri, 15 Jan 2010 01:02:24 +0000
Subject: [PATCH] fix bad library order

---
 packages/plunit/Makefile.in | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/packages/plunit/Makefile.in b/packages/plunit/Makefile.in
index 3397a977a..8d7e9590e 100644
--- a/packages/plunit/Makefile.in
+++ b/packages/plunit/Makefile.in
@@ -17,14 +17,16 @@ EROOTDIR = @exec_prefix@
 srcdir=@srcdir@
 
 BINDIR = $(EROOTDIR)/bin
+LIBDIR=$(EROOTDIR)/lib
+SHAREDIR=$(EROOTDIR)/share/Yap
 YAPLIBDIR=$(EROOTDIR)/lib/Yap
-# hack for SWI compatibility
-LIBDIR=$(EROOTDIR)/share/Yap
 
 PL=@EXTEND_DYNLOADER_PATH@ $(DESTDIR)$(BINDIR)/yap $(DESTDIR)$(YAPLIBDIR)/startup.yss
 LN_S=@LN_S@
 EXDIR=$(LIBDIR)/examples/plunit
 
+INSTALLDIR=$(SHAREDIR)
+
 else	# SWI
 
 srcdir=.
@@ -38,6 +40,8 @@ PCEHOME=../xpce
 LIBDIR=$(PLBASE)/library
 EXDIR=$(PKGDOC)/examples/plunit
 
+INSTALLDIR=$(LIBDIR)
+
 endif
 
 DESTDIR=
@@ -63,15 +67,15 @@ all:
 		@echo "Nothing to do for this package"
 
 install:	$(LIBPL)
-		mkdir -p $(DESTDIR)$(LIBDIR)
-		$(INSTALL_DATA) $(LIBALL) $(DESTDIR)$(LIBDIR)
+		mkdir -p $(DESTDIR)$(INSTALLDIR)
+		$(INSTALL_DATA) $(LIBALL) $(DESTDIR)$(INSTALLDIR)
 		$(PL) -f none -g make -t halt
 
 ln-install:	$(LIBPL)
-		mkdir -p $(DESTDIR)$(LIBDIR)
+		mkdir -p $(DESTDIR)$(INSTALLDIR)
 		for f in $(LIBALL); do \
-		    rm -f $(DESTDIR)$(LIBDIR)/$$f; \
-		    ln -s `pwd`/$$f $(DESTDIR)$(LIBDIR); \
+		    rm -f $(DESTDIR)$(INSTALLDIR)/$$f; \
+		    ln -s `pwd`/$$f $(DESTDIR)$(INSTALLDIR); \
 		done
 		$(PL) -f none -g make -t halt
 
@@ -88,7 +92,7 @@ install-examples::
 		(cd examples && $(INSTALL_DATA) $(EXAMPLES) $(DESTDIR)$(EXDIR))
 
 uninstall::
-		rm -f $(LIBDIR)/plunit.pl
+		rm -f $(DESTDIR)$(INSTALLDIR)/plunit.pl
 		$(PL) -f none -g make -t halt
 
 check::