diff -ur Yap-5.1.1.orig/CLPBN/Makefile.in Yap-5.1.1/CLPBN/Makefile.in
--- Yap-5.1.1.orig/CLPBN/Makefile.in	2006-01-18 03:45:28.000000000 +1300
+++ Yap-5.1.1/CLPBN/Makefile.in	2007-01-21 09:49:01.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-5.1.1.orig/LGPL/JPL/Makefile.in Yap-5.1.1/LGPL/JPL/Makefile.in
--- Yap-5.1.1.orig/LGPL/JPL/Makefile.in	2005-03-13 19:26:11.000000000 +1300
+++ Yap-5.1.1/LGPL/JPL/Makefile.in	2007-01-21 09:49:01.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-5.1.1.orig/LGPL/JPL/java/Makefile.in Yap-5.1.1/LGPL/JPL/java/Makefile.in
--- Yap-5.1.1.orig/LGPL/JPL/java/Makefile.in	2006-03-23 03:00:28.000000000 +1200
+++ Yap-5.1.1/LGPL/JPL/java/Makefile.in	2007-01-21 09:49:01.000000000 +1300
@@ -15,7 +15,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-5.1.1.orig/LGPL/JPL/src/Makefile.in Yap-5.1.1/LGPL/JPL/src/Makefile.in
--- Yap-5.1.1.orig/LGPL/JPL/src/Makefile.in	2006-03-23 03:00:28.000000000 +1200
+++ Yap-5.1.1/LGPL/JPL/src/Makefile.in	2007-01-21 09:49:01.000000000 +1300
@@ -19,7 +19,7 @@
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 #
 CC=@CC@
diff -ur Yap-5.1.1.orig/LGPL/clp/Makefile.in Yap-5.1.1/LGPL/clp/Makefile.in
--- Yap-5.1.1.orig/LGPL/clp/Makefile.in	2005-10-29 06:53:27.000000000 +1300
+++ Yap-5.1.1/LGPL/clp/Makefile.in	2007-01-21 09:49:01.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-5.1.1.orig/Makefile.in Yap-5.1.1/Makefile.in
--- Yap-5.1.1.orig/Makefile.in	2006-04-13 23:34:33.000000000 +1200
+++ Yap-5.1.1/Makefile.in	2007-01-21 09:49:01.000000000 +1300
@@ -4,7 +4,7 @@
 #
 prefix = @prefix@
 ROOTDIR = $(prefix)
-EROOTDIR = @exec_prefix@
+EROOTDIR = @prefix@
 #
 # where the binary should be
 #
@@ -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-5.1.1.orig/library/Makefile.in Yap-5.1.1/library/Makefile.in
--- Yap-5.1.1.orig/library/Makefile.in	2006-04-11 07:24:52.000000000 +1200
+++ Yap-5.1.1/library/Makefile.in	2007-01-21 09:49:01.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-5.1.1.orig/library/Tries/Makefile.in Yap-5.1.1/library/Tries/Makefile.in
--- Yap-5.1.1.orig/library/Tries/Makefile.in	2004-08-12 04:14:54.000000000 +1200
+++ Yap-5.1.1/library/Tries/Makefile.in	2007-01-21 09:49:01.000000000 +1300
@@ -18,7 +18,7 @@
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 #
 CC=@CC@
diff -ur Yap-5.1.1.orig/library/mpi/Makefile.in Yap-5.1.1/library/mpi/Makefile.in
--- Yap-5.1.1.orig/library/mpi/Makefile.in	2002-02-27 06:25:33.000000000 +1300
+++ Yap-5.1.1/library/mpi/Makefile.in	2007-01-21 09:49:01.000000000 +1300
@@ -20,8 +20,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-5.1.1.orig/library/random/Makefile.in Yap-5.1.1/library/random/Makefile.in
--- Yap-5.1.1.orig/library/random/Makefile.in	2002-11-13 08:53:52.000000000 +1300
+++ Yap-5.1.1/library/random/Makefile.in	2007-01-21 09:49:01.000000000 +1300
@@ -12,7 +12,7 @@
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 #
 CC=@CC@
diff -ur Yap-5.1.1.orig/library/regex/Makefile.in Yap-5.1.1/library/regex/Makefile.in
--- Yap-5.1.1.orig/library/regex/Makefile.in	2004-10-01 09:16:20.000000000 +1200
+++ Yap-5.1.1/library/regex/Makefile.in	2007-01-21 09:49:01.000000000 +1300
@@ -12,7 +12,7 @@
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 #
 CC=@CC@
diff -ur Yap-5.1.1.orig/library/system/Makefile.in Yap-5.1.1/library/system/Makefile.in
--- Yap-5.1.1.orig/library/system/Makefile.in	2002-11-13 08:53:52.000000000 +1300
+++ Yap-5.1.1/library/system/Makefile.in	2007-01-21 09:49:01.000000000 +1300
@@ -12,7 +12,7 @@
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 #
 CC=@CC@
diff -ur Yap-5.1.1.orig/library/yap2swi/Makefile.in Yap-5.1.1/library/yap2swi/Makefile.in
--- Yap-5.1.1.orig/library/yap2swi/Makefile.in	2004-08-12 04:14:54.000000000 +1200
+++ Yap-5.1.1/library/yap2swi/Makefile.in	2007-01-21 09:49:01.000000000 +1300
@@ -12,7 +12,7 @@
 #
 # where YAP should look for libraries
 #
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
 #
 #
 CC=@CC@