diff -ur yap-6.0.2.orig/CLPQR/Makefile.in yap-6.0.2/CLPQR/Makefile.in
--- yap-6.0.2.orig/CLPQR/Makefile.in	2010-03-04 13:57:29.000000000 +1300
+++ yap-6.0.2/CLPQR/Makefile.in	2010-03-05 21:45:24.000000000 +1300
@@ -9,7 +9,7 @@
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(ROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 # where YAP should look for architecture-independent Prolog libraries
 #
diff -ur yap-6.0.2.orig/GPL/Makefile.in yap-6.0.2/GPL/Makefile.in
--- yap-6.0.2.orig/GPL/Makefile.in	2010-03-04 13:57:29.000000000 +1300
+++ yap-6.0.2/GPL/Makefile.in	2010-03-05 21:45:24.000000000 +1300
@@ -9,7 +9,7 @@
 #
 # where YAP should look for binary libraries
 #
-LIBDIR=$(ROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 # where YAP should look for architecture-independent Prolog libraries
 #
diff -ur yap-6.0.2.orig/LGPL/Makefile.in yap-6.0.2/LGPL/Makefile.in
--- yap-6.0.2.orig/LGPL/Makefile.in	2010-03-04 13:57:29.000000000 +1300
+++ yap-6.0.2/LGPL/Makefile.in	2010-03-05 21:45:24.000000000 +1300
@@ -9,7 +9,7 @@
 #
 # where YAP should look for binary libraries
 #
-LIBDIR=$(ROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 # where YAP should look for architecture-independent Prolog libraries
 #
diff -ur yap-6.0.2.orig/LGPL/clp/Makefile.in yap-6.0.2/LGPL/clp/Makefile.in
--- yap-6.0.2.orig/LGPL/clp/Makefile.in	2010-03-04 13:57:29.000000000 +1300
+++ yap-6.0.2/LGPL/clp/Makefile.in	2010-03-05 21:45:24.000000000 +1300
@@ -9,7 +9,7 @@
 #
 # where YAP should look for binary libraries
 #
-LIBDIR=$(ROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 # where YAP should look for architecture-independent Prolog libraries
 #
diff -ur yap-6.0.2.orig/LGPL/swi_console/Makefile.in yap-6.0.2/LGPL/swi_console/Makefile.in
--- yap-6.0.2.orig/LGPL/swi_console/Makefile.in	2010-03-04 13:57:29.000000000 +1300
+++ yap-6.0.2/LGPL/swi_console/Makefile.in	2010-03-05 21:45:24.000000000 +1300
@@ -8,7 +8,7 @@
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 #
 CC=@CC@
diff -ur yap-6.0.2.orig/Makefile.in yap-6.0.2/Makefile.in
--- yap-6.0.2.orig/Makefile.in	2010-03-04 13:57:29.000000000 +1300
+++ yap-6.0.2/Makefile.in	2010-03-05 21:45:24.000000000 +1300
@@ -12,8 +12,8 @@
 #
 # where YAP should look for binary libraries
 #
-LIBDIR=$(EROOTDIR)/lib
-YAPLIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@
+YAPLIBDIR=@libdir@/Yap
 #
 # where YAP should look for architecture-independent Prolog libraries
 #
diff -ur yap-6.0.2.orig/library/Makefile.in yap-6.0.2/library/Makefile.in
--- yap-6.0.2.orig/library/Makefile.in	2010-03-04 13:57:29.000000000 +1300
+++ yap-6.0.2/library/Makefile.in	2010-03-05 21:45:24.000000000 +1300
@@ -9,7 +9,7 @@
 #
 # where YAP should look for binary libraries
 #
-LIBDIR=$(ROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 # where YAP should look for architecture-independent Prolog libraries
 #
diff -ur yap-6.0.2.orig/library/lammpi/Makefile.in yap-6.0.2/library/lammpi/Makefile.in
--- yap-6.0.2.orig/library/lammpi/Makefile.in	2010-03-04 13:57:29.000000000 +1300
+++ yap-6.0.2/library/lammpi/Makefile.in	2010-03-05 21:45:24.000000000 +1300
@@ -17,7 +17,7 @@
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 #
 CC=@CC@
diff -ur yap-6.0.2.orig/library/matlab/Makefile.in yap-6.0.2/library/matlab/Makefile.in
--- yap-6.0.2.orig/library/matlab/Makefile.in	2010-03-04 13:57:29.000000000 +1300
+++ yap-6.0.2/library/matlab/Makefile.in	2010-03-05 21:45:24.000000000 +1300
@@ -13,7 +13,7 @@
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 #
 CC=@CC@
diff -ur yap-6.0.2.orig/library/matrices/Makefile.in yap-6.0.2/library/matrices/Makefile.in
--- yap-6.0.2.orig/library/matrices/Makefile.in	2010-03-04 13:57:29.000000000 +1300
+++ yap-6.0.2/library/matrices/Makefile.in	2010-03-05 21:45:24.000000000 +1300
@@ -13,7 +13,7 @@
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 #
 CC=@CC@
diff -ur yap-6.0.2.orig/library/matrix/Makefile.in yap-6.0.2/library/matrix/Makefile.in
--- yap-6.0.2.orig/library/matrix/Makefile.in	2010-03-04 13:57:29.000000000 +1300
+++ yap-6.0.2/library/matrix/Makefile.in	2010-03-05 21:45:24.000000000 +1300
@@ -13,7 +13,7 @@
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 #
 CC=@CC@
diff -ur yap-6.0.2.orig/library/mpi/Makefile.in yap-6.0.2/library/mpi/Makefile.in
--- yap-6.0.2.orig/library/mpi/Makefile.in	2010-03-04 13:57:29.000000000 +1300
+++ yap-6.0.2/library/mpi/Makefile.in	2010-03-05 21:45:24.000000000 +1300
@@ -21,8 +21,8 @@
 #
 # where YAP should look for binary libraries
 #
-LIBDIR=$(EROOTDIR)/lib
-YAPLIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@
+YAPLIBDIR=@libdir@/Yap
 #
 # where YAP should look for architecture-independent Prolog libraries
 #
diff -ur yap-6.0.2.orig/library/random/Makefile.in yap-6.0.2/library/random/Makefile.in
--- yap-6.0.2.orig/library/random/Makefile.in	2010-03-04 13:57:29.000000000 +1300
+++ yap-6.0.2/library/random/Makefile.in	2010-03-05 21:45:24.000000000 +1300
@@ -13,7 +13,7 @@
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 #
 CC=@CC@
diff -ur yap-6.0.2.orig/library/regex/Makefile.in yap-6.0.2/library/regex/Makefile.in
--- yap-6.0.2.orig/library/regex/Makefile.in	2010-03-04 13:57:29.000000000 +1300
+++ yap-6.0.2/library/regex/Makefile.in	2010-03-05 21:45:24.000000000 +1300
@@ -13,7 +13,7 @@
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 #
 CC=@CC@
diff -ur yap-6.0.2.orig/library/rltree/Makefile.in yap-6.0.2/library/rltree/Makefile.in
--- yap-6.0.2.orig/library/rltree/Makefile.in	2010-03-04 13:57:29.000000000 +1300
+++ yap-6.0.2/library/rltree/Makefile.in	2010-03-05 21:45:24.000000000 +1300
@@ -17,7 +17,7 @@
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 #
 CC=@CC@
diff -ur yap-6.0.2.orig/library/system/Makefile.in yap-6.0.2/library/system/Makefile.in
--- yap-6.0.2.orig/library/system/Makefile.in	2010-03-04 13:57:29.000000000 +1300
+++ yap-6.0.2/library/system/Makefile.in	2010-03-05 21:45:24.000000000 +1300
@@ -13,7 +13,7 @@
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 #
 CC=@CC@
diff -ur yap-6.0.2.orig/library/tries/Makefile.in yap-6.0.2/library/tries/Makefile.in
--- yap-6.0.2.orig/library/tries/Makefile.in	2010-03-04 13:57:29.000000000 +1300
+++ yap-6.0.2/library/tries/Makefile.in	2010-03-05 21:45:24.000000000 +1300
@@ -13,7 +13,7 @@
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 #
 CC=@CC@
diff -ur yap-6.0.2.orig/library/yap2swi/Makefile.in yap-6.0.2/library/yap2swi/Makefile.in
--- yap-6.0.2.orig/library/yap2swi/Makefile.in	2010-03-04 13:57:29.000000000 +1300
+++ yap-6.0.2/library/yap2swi/Makefile.in	2010-03-05 21:45:24.000000000 +1300
@@ -13,7 +13,7 @@
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 #
 CC=@CC@
diff -ur yap-6.0.2.orig/packages/CLPBN/Makefile.in yap-6.0.2/packages/CLPBN/Makefile.in
--- yap-6.0.2.orig/packages/CLPBN/Makefile.in	2010-03-04 13:57:29.000000000 +1300
+++ yap-6.0.2/packages/CLPBN/Makefile.in	2010-03-05 21:45:24.000000000 +1300
@@ -9,7 +9,7 @@
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(ROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 # where YAP should look for architecture-independent Prolog libraries
 #
diff -ur yap-6.0.2.orig/packages/PLStream/Makefile.in yap-6.0.2/packages/PLStream/Makefile.in
--- yap-6.0.2.orig/packages/PLStream/Makefile.in	2010-03-04 13:57:29.000000000 +1300
+++ yap-6.0.2/packages/PLStream/Makefile.in	2010-03-05 21:45:24.000000000 +1300
@@ -14,7 +14,7 @@
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 #
 CC=@CC@
diff -ur yap-6.0.2.orig/packages/ProbLog/Makefile.in yap-6.0.2/packages/ProbLog/Makefile.in
--- yap-6.0.2.orig/packages/ProbLog/Makefile.in	2010-03-04 13:57:29.000000000 +1300
+++ yap-6.0.2/packages/ProbLog/Makefile.in	2010-03-05 21:45:24.000000000 +1300
@@ -9,7 +9,7 @@
 #
 # where YAP should look for binary libraries
 #
-LIBDIR=$(ROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 # where YAP should look for architecture-independent Prolog libraries
 #
diff -ur yap-6.0.2.orig/packages/ProbLog/simplecudd/Makefile.in yap-6.0.2/packages/ProbLog/simplecudd/Makefile.in
--- yap-6.0.2.orig/packages/ProbLog/simplecudd/Makefile.in	2010-03-04 13:57:29.000000000 +1300
+++ yap-6.0.2/packages/ProbLog/simplecudd/Makefile.in	2010-03-05 21:45:24.000000000 +1300
@@ -13,7 +13,7 @@
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 #
 CC=@CC@
diff -ur yap-6.0.2.orig/packages/chr/Makefile.in yap-6.0.2/packages/chr/Makefile.in
--- yap-6.0.2.orig/packages/chr/Makefile.in	2010-03-04 13:57:48.000000000 +1300
+++ yap-6.0.2/packages/chr/Makefile.in	2010-03-05 21:45:24.000000000 +1300
@@ -15,8 +15,8 @@
 srcdir=@srcdir@
 
 BINDIR = $(EROOTDIR)/bin
-LIBDIR=$(EROOTDIR)/lib
-YAPLIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@
+YAPLIBDIR=@libdir@/Yap
 SHAREDIR=$(ROOTDIR)/share/Yap
 
 SHELL=@SHELL@
diff -ur yap-6.0.2.orig/packages/clpqr/Makefile.in yap-6.0.2/packages/clpqr/Makefile.in
--- yap-6.0.2.orig/packages/clpqr/Makefile.in	2010-03-04 13:57:49.000000000 +1300
+++ yap-6.0.2/packages/clpqr/Makefile.in	2010-03-05 21:45:24.000000000 +1300
@@ -18,8 +18,8 @@
 ROOTDIR = $(prefix)
 EROOTDIR = @exec_prefix@
 BINDIR = $(EROOTDIR)/bin
-LIBDIR=$(EROOTDIR)/lib
-YAPLIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@
+YAPLIBDIR=@libdir@/Yap
 SHAREDIR=$(ROOTDIR)/share/Yap
 CLPDIR=$(SHAREDIR)
 else
diff -ur yap-6.0.2.orig/packages/cplint/Makefile.in yap-6.0.2/packages/cplint/Makefile.in
--- yap-6.0.2.orig/packages/cplint/Makefile.in	2010-03-04 13:57:29.000000000 +1300
+++ yap-6.0.2/packages/cplint/Makefile.in	2010-03-05 21:45:24.000000000 +1300
@@ -12,7 +12,7 @@
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(ROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 # where YAP should look for architecture-independent Prolog libraries
 #
diff -ur yap-6.0.2.orig/packages/jpl/Makefile.in yap-6.0.2/packages/jpl/Makefile.in
--- yap-6.0.2.orig/packages/jpl/Makefile.in	2010-03-04 13:57:50.000000000 +1300
+++ yap-6.0.2/packages/jpl/Makefile.in	2010-03-05 21:45:24.000000000 +1300
@@ -22,8 +22,8 @@
 srcdir=@srcdir@
 
 BINDIR = $(EROOTDIR)/bin
-LIBDIR=$(EROOTDIR)/lib
-YAPLIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@
+YAPLIBDIR=@libdir@/Yap
 SHAREDIR=$(ROOTDIR)/share/Yap
 SHLIB_CFLAGS=@SHLIB_CFLAGS@
 
diff -ur yap-6.0.2.orig/packages/plunit/Makefile.in yap-6.0.2/packages/plunit/Makefile.in
--- yap-6.0.2.orig/packages/plunit/Makefile.in	2010-03-04 13:57:29.000000000 +1300
+++ yap-6.0.2/packages/plunit/Makefile.in	2010-03-05 21:45:24.000000000 +1300
@@ -17,9 +17,9 @@
 srcdir=@srcdir@
 
 BINDIR = $(EROOTDIR)/bin
-LIBDIR=$(EROOTDIR)/lib
+LIBDIR=@libdir@
 SHAREDIR=$(EROOTDIR)/share/Yap
-YAPLIBDIR=$(EROOTDIR)/lib/Yap
+YAPLIBDIR=@libdir@/Yap
 
 PL=@EXTEND_DYNLOADER_PATH@ $(DESTDIR)$(BINDIR)/yap $(DESTDIR)$(YAPLIBDIR)/startup.yss
 LN_S=@LN_S@
diff -ur yap-6.0.2.orig/packages/sgml/Makefile.in yap-6.0.2/packages/sgml/Makefile.in
--- yap-6.0.2.orig/packages/sgml/Makefile.in	2010-03-04 13:57:29.000000000 +1300
+++ yap-6.0.2/packages/sgml/Makefile.in	2010-03-05 21:45:24.000000000 +1300
@@ -16,8 +16,8 @@
 srcdir=@srcdir@
 
 BINDIR = $(EROOTDIR)/bin
-LIBDIR=$(EROOTDIR)/lib
-YAPLIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@
+YAPLIBDIR=@libdir@/Yap
 SHAREDIR=$(ROOTDIR)/share/Yap
 
 SHELL=@SHELL@
diff -ur yap-6.0.2.orig/packages/swi-minisat2/C/Makefile.in yap-6.0.2/packages/swi-minisat2/C/Makefile.in
--- yap-6.0.2.orig/packages/swi-minisat2/C/Makefile.in	2010-03-04 13:57:29.000000000 +1300
+++ yap-6.0.2/packages/swi-minisat2/C/Makefile.in	2010-03-05 21:45:24.000000000 +1300
@@ -14,7 +14,7 @@
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 #
 CC=@CC@
diff -ur yap-6.0.2.orig/packages/swi-minisat2/Makefile.in yap-6.0.2/packages/swi-minisat2/Makefile.in
--- yap-6.0.2.orig/packages/swi-minisat2/Makefile.in	2010-03-04 13:57:29.000000000 +1300
+++ yap-6.0.2/packages/swi-minisat2/Makefile.in	2010-03-05 21:45:24.000000000 +1300
@@ -9,7 +9,7 @@
 #
 # where YAP should look for binary libraries
 #
-LIBDIR=$(ROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 # where YAP should look for architecture-independent Prolog libraries
 #