From ca85f690cdd0ee990495859d4971213d43aa83c7 Mon Sep 17 00:00:00 2001
From: stasinos <stasinos@b08c6af1-5177-4d33-ba66-4b1c6b8b522a>
Date: Mon, 26 Nov 2001 18:57:07 +0000
Subject: [PATCH] configure expands variables only once

git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@201 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
---
 Makefile.in                | 11 ++++-------
 library/random/Makefile.in |  3 ++-
 library/regex/Makefile.in  |  3 ++-
 library/system/Makefile.in |  3 ++-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index ec31f873a..6cab68935 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,7 +2,8 @@
 # default base directory for YAP installation
 # (EROOT for architecture-dependent files)
 #
-ROOTDIR = @prefix@
+prefix = @prefix@
+ROOTDIR = $(prefix)
 EROOTDIR = @exec_prefix@
 #
 # where the binary should be
@@ -58,10 +59,6 @@ CFLAGS= @CFLAGS@ $(YAP_EXTRAS) $(DEFS) $(CPPFLAGS)
 C_INTERF_FLAGS= @C_INTERF_FLAGS@ $(YAP_EXTRAS) $(DEFS) $(CPPFLAGS) -I$(srcdir)/include
 C_PARSER_FLAGS= @C_PARSER_FLAGS@ $(YAP_EXTRAS) $(DEFS) $(CPPFLAGS)
 #
-# where YAP should look for architecture-independent Prolog libraries
-#
-SHAREDIR=$(ROOTDIR)/share/Yap
-#
 #
 # You shouldn't need to change what follows.
 #
@@ -499,8 +496,8 @@ install_library: libYap.a
 
 install_data:
 	(cd library ; make install)
-	$(INSTALL_DATA) $(srcdir)/LGPL/pillow/icon_address.pl $(DESTDIR)$(SHAREDIR)/Yap
-	$(INSTALL_DATA) $(srcdir)/LGPL/pillow/pillow.pl $(DESTDIR)$(SHAREDIR)/Yap
+	$(INSTALL_DATA) $(srcdir)/LGPL/pillow/icon_address.pl $(DESTDIR)$(SHAREDIR)/Yap/
+	$(INSTALL_DATA) $(srcdir)/LGPL/pillow/pillow.pl $(DESTDIR)$(SHAREDIR)/Yap/
 	(cd CLPQR ; make install)
 	(cd CHR ; make install)
 
diff --git a/library/random/Makefile.in b/library/random/Makefile.in
index 045bd0a4d..9edce4f37 100644
--- a/library/random/Makefile.in
+++ b/library/random/Makefile.in
@@ -2,7 +2,8 @@
 # default base directory for YAP installation
 # (EROOT for architecture-dependent files)
 #
-ROOTDIR = @prefix@
+prefix = @prefix@
+ROOTDIR = $(prefix)
 EROOTDIR = @exec_prefix@
 #
 # where the binary should be
diff --git a/library/regex/Makefile.in b/library/regex/Makefile.in
index 6b2352fbf..a438221f2 100644
--- a/library/regex/Makefile.in
+++ b/library/regex/Makefile.in
@@ -2,7 +2,8 @@
 # default base directory for YAP installation
 # (EROOT for architecture-dependent files)
 #
-ROOTDIR = @prefix@
+prefix = @prefix@
+ROOTDIR = $(prefix)
 EROOTDIR = @exec_prefix@
 #
 # where the binary should be
diff --git a/library/system/Makefile.in b/library/system/Makefile.in
index b0a17d937..e054e09e6 100644
--- a/library/system/Makefile.in
+++ b/library/system/Makefile.in
@@ -2,7 +2,8 @@
 # default base directory for YAP installation
 # (EROOT for architecture-dependent files)
 #
-ROOTDIR = @prefix@
+prefix = @prefix@
+ROOTDIR = $(prefix)
 EROOTDIR = @exec_prefix@
 #
 # where the binary should be