Mercurial > hg > release > icedtea6-1.3
changeset 949:011c674ae765
Fix use of paths that won't work when srcdir != builddir
2008-07-03 Andrew John Hughes <gnu_andrew@member.fsf.org>
* b/Makefile.am: Fix use of abs_top_srcdir
for CACAO and lack of path for HACKING.
* b/Makefile.in: Regenerated.
* b/acinclude.m4: Fix CACAO path as above.
* b/configure: Regenerated.
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Thu, 03 Jul 2008 16:04:29 +0100 |
| parents | 98c884841679 |
| children | 6707684e37c8 |
| files | ChangeLog Makefile.am Makefile.in acinclude.m4 configure |
| diffstat | 5 files changed, 18 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Jul 03 01:37:42 2008 +0200 +++ b/ChangeLog Thu Jul 03 16:04:29 2008 +0100 @@ -1,3 +1,11 @@ +2008-07-03 Andrew John Hughes <gnu_andrew@member.fsf.org> + + * b/Makefile.am: Fix use of abs_top_srcdir + for CACAO and lack of path for HACKING. + * b/Makefile.in: Regenerated. + * b/acinclude.m4: Fix CACAO path as above. + * b/configure: Regenerated. + 2008-07-02 Matthias Klose <doko@ubuntu.com> * configure.ac: Restore check for libxul-unstable.
--- a/Makefile.am Thu Jul 03 01:37:42 2008 +0200 +++ b/Makefile.am Thu Jul 03 16:04:29 2008 +0100 @@ -462,7 +462,7 @@ 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 @@ 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 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
--- a/Makefile.in Thu Jul 03 01:37:42 2008 +0200 +++ b/Makefile.in Thu Jul 03 16:04:29 2008 +0100 @@ -1492,10 +1492,10 @@ 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 \ -@USE_SYSTEM_CACAO_FALSE@ --prefix=$(abs_top_srcdir)/cacao/install \ +@USE_SYSTEM_CACAO_FALSE@ --prefix=$(abs_top_builddir)/cacao/install \ @USE_SYSTEM_CACAO_FALSE@ --with-java-runtime-library=openjdk \ -@USE_SYSTEM_CACAO_FALSE@ --with-java-runtime-library-prefix=$(abs_top_srcdir)/openjdk \ -@USE_SYSTEM_CACAO_FALSE@ --with-java-runtime-library-classes=$(abs_top_srcdir)/lib/rt \ +@USE_SYSTEM_CACAO_FALSE@ --with-java-runtime-library-prefix=$(abs_top_builddir)/openjdk \ +@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
--- a/acinclude.m4 Thu Jul 03 01:37:42 2008 +0200 +++ b/acinclude.m4 Thu Jul 03 16:04:29 2008 +0100 @@ -734,7 +734,7 @@ 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})