Mercurial > hg > release > icedtea6-1.2
changeset 538:9215c325a2bd cacao
2007-12-20 Lillian Angel <langel@redhat.com>
* Makefile.am: Added checks for ICEDTEA_HOME and SYSTEM_GCJ_DIR.
* Makefile.in: Regenerate.
author | Lillian Angel <langel@redhat.com> |
---|---|
date | Thu, 20 Dec 2007 09:49:54 -0500 |
parents | 5e6b21015b29 |
children | d416a2d5ad11 |
files | ChangeLog Makefile.am Makefile.in |
diffstat | 3 files changed, 55 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Dec 19 11:02:06 2007 -0500 +++ b/ChangeLog Thu Dec 20 09:49:54 2007 -0500 @@ -1,3 +1,8 @@ +2007-12-20 Lillian Angel <langel@redhat.com> + + * Makefile.am: Added checks for ICEDTEA_HOME and SYSTEM_GCJ_DIR. + * Makefile.in: Regenerate. + 2007-12-19 Lillian Angel <langel@redhat.com> * patches/icedtea-version.patch: Added patch to change bug report url.
--- a/Makefile.am Wed Dec 19 11:02:06 2007 -0500 +++ b/Makefile.am Thu Dec 20 09:49:54 2007 -0500 @@ -326,7 +326,14 @@ stamps/bootstrap-directory-symlink.stamp: $(BOOTSTRAP_DIRECTORY_STAMP) mkdir -p bootstrap rm -f bootstrap/jdk1.6.0 - ln -sf $(ICEDTEA_HOME) bootstrap/jdk1.6.0 + if test -d $(ICEDTEA_HOME); \ + then \ + ln -sf $(ICEDTEA_HOME) bootstrap/jdk1.6.0; \ + else \ + echo $(ICEDTEA_HOME) " cannot be found. Try reconfiguring with " \ + "--with-icedtea-home=/path/to/java-icedtea-devel"; \ + exit 1; \ + fi if ! bootstrap/jdk1.6.0/bin/java -version ; \ then \ echo "bootstrap/jdk1.6.0/bin/java" \ @@ -357,15 +364,23 @@ ln -sf $(XALAN2_SERIALIZER_JAR) \ bootstrap/ecj/lib/endorsed/xalan-j2-serializer.jar ln -sf $(XERCES2_JAR) bootstrap/ecj/lib/endorsed/xerces-j2.jar - mkdir -p bootstrap/ecj/jre/lib - ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/$(INSTALL_ARCH_DIR) bootstrap/ecj/jre/lib/ - mkdir -p bootstrap/ecj/include - for i in $(SYSTEM_GCJ_DIR)/include/*; do \ - test -r $$i | continue; \ - i=`basename $$i`; \ - rm -f bootstrap/ecj/include/$$i; \ - ln -s $(SYSTEM_GCJ_DIR)/include/$$i bootstrap/ecj/include/$$i; \ - done + if test -d $(SYSTEM_GCJ_DIR); \ + then \ + mkdir -p bootstrap/ecj/jre/lib; \ + ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/$(INSTALL_ARCH_DIR) \ + bootstrap/ecj/jre/lib/; \ + mkdir -p bootstrap/ecj/include; \ + for i in $(SYSTEM_GCJ_DIR)/include/*; do \ + test -r $$i | continue; \ + i=`basename $$i`; \ + rm -f bootstrap/ecj/include/$$i; \ + ln -s $(SYSTEM_GCJ_DIR)/include/$$i bootstrap/ecj/include/$$i; \ + done; \ + else \ + echo $(SYSTEM_GCJ_DIR) " cannot be found. Try reconfiguring with " \ + --with-gcj-home=/path/to/java-gcj-devel ; \ + exit 1; \ + fi if test -f bootstrap/jdk1.7.0/jre/lib/tools.jar ; \ then \ mkdir -p bootstrap/ecj/lib ; \
--- a/Makefile.in Wed Dec 19 11:02:06 2007 -0500 +++ b/Makefile.in Thu Dec 20 09:49:54 2007 -0500 @@ -741,7 +741,14 @@ stamps/bootstrap-directory-symlink.stamp: $(BOOTSTRAP_DIRECTORY_STAMP) mkdir -p bootstrap rm -f bootstrap/jdk1.6.0 - ln -sf $(ICEDTEA_HOME) bootstrap/jdk1.6.0 + if test -d $(ICEDTEA_HOME); \ + then \ + ln -sf $(ICEDTEA_HOME) bootstrap/jdk1.6.0; \ + else \ + echo $(ICEDTEA_HOME) " cannot be found. Try reconfiguring with " \ + "--with-icedtea-home=/path/to/java-icedtea-devel"; \ + exit 1; \ + fi if ! bootstrap/jdk1.6.0/bin/java -version ; \ then \ echo "bootstrap/jdk1.6.0/bin/java" \ @@ -772,15 +779,23 @@ ln -sf $(XALAN2_SERIALIZER_JAR) \ bootstrap/ecj/lib/endorsed/xalan-j2-serializer.jar ln -sf $(XERCES2_JAR) bootstrap/ecj/lib/endorsed/xerces-j2.jar - mkdir -p bootstrap/ecj/jre/lib - ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/$(INSTALL_ARCH_DIR) bootstrap/ecj/jre/lib/ - mkdir -p bootstrap/ecj/include - for i in $(SYSTEM_GCJ_DIR)/include/*; do \ - test -r $$i | continue; \ - i=`basename $$i`; \ - rm -f bootstrap/ecj/include/$$i; \ - ln -s $(SYSTEM_GCJ_DIR)/include/$$i bootstrap/ecj/include/$$i; \ - done + if test -d $(SYSTEM_GCJ_DIR); \ + then \ + mkdir -p bootstrap/ecj/jre/lib; \ + ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/$(INSTALL_ARCH_DIR) \ + bootstrap/ecj/jre/lib/; \ + mkdir -p bootstrap/ecj/include; \ + for i in $(SYSTEM_GCJ_DIR)/include/*; do \ + test -r $$i | continue; \ + i=`basename $$i`; \ + rm -f bootstrap/ecj/include/$$i; \ + ln -s $(SYSTEM_GCJ_DIR)/include/$$i bootstrap/ecj/include/$$i; \ + done; \ + else \ + echo $(SYSTEM_GCJ_DIR) " cannot be found. Try reconfiguring with " \ + --with-gcj-home=/path/to/java-gcj-devel ; \ + exit 1; \ + fi if test -f bootstrap/jdk1.7.0/jre/lib/tools.jar ; \ then \ mkdir -p bootstrap/ecj/lib ; \