configure expands variables only once

git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@201 b08c6af1-5177-4d33-ba66-4b1c6b8b522a

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)
 

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

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

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