FYI: Fix build paths

[Andrew Hughes]

It seems I'm the only one who uses an out-of-srcdir build...
because more things keep creeping in.

ChangeLog:

2008-07-03  Andrew John Hughes  <gnu_andrew at member.fsf.org>

	* Makefile.am: Fix use of abs_top_srcdir
	for CACAO and lack of path for HACKING.
	* Makefile.in: Regenerated.
	* acinclude.m4: Fix CACAO path as above.
	* configure: Regenerated.

-- 
A. :)

Room 122, Department of Computer Science
http://www.dcs.shef.ac.uk/~andrew
PGP Key: 0D118B89 (http://subkeys.pgp.net)
Fingerprint: 711E 2AC8 72FE F5CE BB0C  0637 9678 5E51 0D11 8B89
-------------- next part --------------
diff -r 98c884841679 Makefile.am
--- a/Makefile.am	Thu Jul 03 01:37:42 2008 +0200
+++ b/Makefile.am	Thu Jul 03 16:02:26 2008 +0100
@@ -462,7 +462,7 @@ stamps/patch.stamp: stamps/patch-fsg.sta
 	  then \
 	    echo Applying $$p ; \
 	    $(PATCH) -l -p0 < $(abs_top_srcdir)/$$p ; \
-	    if ! grep "^\* $$(basename $$p)" HACKING >> stamps/patch.stamp.tmp ; \
+	    if ! grep "^\* $$(basename $$p)" $(abs_top_srcdir)/HACKING >> stamps/patch.stamp.tmp ; \
 	    then \
 	      echo "* $$(basename $$p): UNDOCUMENTED" >> stamps/patch.stamp.tmp ; \
 	    fi ; \
@@ -508,7 +508,7 @@ stamps/patch-fsg.stamp: stamps/extract.s
 	  then \
 	    echo Applying $$p ; \
 	    $(PATCH) -l -p0 < $(abs_top_srcdir)/$$p ; \
-	    if ! grep "^\* $$(basename $$p)" HACKING >> stamps/patch-fsg.stamp.tmp ; \
+	    if ! grep "^\* $$(basename $$p)" $(abs_top_srcdir)/HACKING >> stamps/patch-fsg.stamp.tmp ; \
 	    then \
 	      echo "* $$(basename $$p): UNDOCUMENTED" >> stamps/patch-fsg.stamp.tmp ; \
 	    fi ; \
@@ -1095,10 +1095,10 @@ if !USE_SYSTEM_CACAO
 if !USE_SYSTEM_CACAO
 	cd cacao/cacao-$(CACAO_VERSION) ; \
 	./configure \
-	  --prefix=$(abs_top_srcdir)/cacao/install \
+	  --prefix=$(abs_top_builddir)/cacao/install \
 	  --with-java-runtime-library=openjdk \
-	  --with-java-runtime-library-prefix=$(abs_top_srcdir)/openjdk \
-	  --with-java-runtime-library-classes=$(abs_top_srcdir)/lib/rt \
+	  --with-java-runtime-library-prefix=$(abs_top_builddir)/openjdk \
+	  --with-java-runtime-library-classes=$(abs_top_builddir)/lib/rt \
 	  --enable-jre-layout ; \
 	make install
 endif
diff -r 98c884841679 Makefile.in
--- a/Makefile.in	Thu Jul 03 01:37:42 2008 +0200
+++ b/Makefile.in	Thu Jul 03 16:02:26 2008 +0100
@@ -1492,10 +1492,10 @@ stamps/cacao.stamp: stamps/extract.stamp
 stamps/cacao.stamp: stamps/extract.stamp stamps/rt-class-files.stamp
 @USE_SYSTEM_CACAO_FALSE@	cd cacao/cacao-$(CACAO_VERSION) ; \
 @USE_SYSTEM_CACAO_FALSE@	./configure \
- at USE_SYSTEM_CACAO_FALSE@	  --prefix=$(abs_top_srcdir)/cacao/install \
+ at USE_SYSTEM_CACAO_FALSE@	  --prefix=$(abs_top_builddir)/cacao/install \
 @USE_SYSTEM_CACAO_FALSE@	  --with-java-runtime-library=openjdk \
- at USE_SYSTEM_CACAO_FALSE@	  --with-java-runtime-library-prefix=$(abs_top_srcdir)/openjdk \
- at USE_SYSTEM_CACAO_FALSE@	  --with-java-runtime-library-classes=$(abs_top_srcdir)/lib/rt \
+ at USE_SYSTEM_CACAO_FALSE@	  --with-java-runtime-library-prefix=$(abs_top_builddir)/openjdk \
+ at USE_SYSTEM_CACAO_FALSE@	  --with-java-runtime-library-classes=$(abs_top_builddir)/lib/rt \
 @USE_SYSTEM_CACAO_FALSE@	  --enable-jre-layout ; \
 @USE_SYSTEM_CACAO_FALSE@	make install
 	mkdir -p stamps
diff -r 98c884841679 acinclude.m4
--- a/acinclude.m4	Thu Jul 03 01:37:42 2008 +0200
+++ b/acinclude.m4	Thu Jul 03 16:02:26 2008 +0100
@@ -734,7 +734,7 @@ AC_DEFUN([AC_CHECK_WITH_CACAO_HOME],
                 AM_CONDITIONAL(USE_SYSTEM_CACAO, true)
               ],
               [
-                CACAO_IMPORT_PATH="\$(abs_top_srcdir)/cacao/install"
+                CACAO_IMPORT_PATH="\$(abs_top_builddir)/cacao/install"
                 AM_CONDITIONAL(USE_SYSTEM_CACAO, false)
               ])
   AC_MSG_RESULT(${CACAO_IMPORT_PATH})
diff -r 98c884841679 configure
--- a/configure	Thu Jul 03 01:37:42 2008 +0200
+++ b/configure	Thu Jul 03 16:02:26 2008 +0100
@@ -8105,7 +8105,7 @@ fi
 
 else
 
-                CACAO_IMPORT_PATH="\$(abs_top_srcdir)/cacao/install"
+                CACAO_IMPORT_PATH="\$(abs_top_builddir)/cacao/install"
                  if false; then
   USE_SYSTEM_CACAO_TRUE=
   USE_SYSTEM_CACAO_FALSE='#'