Mercurial > hg > release > icedtea7-2.5
changeset 1791:a78694915634
2009-04-24 Lillian Angel <langel@redhat.com>
Fixes #497191
* Makefile.am
(NETBEANS_PROFILER_MD5SUM): Updated.
(stamps/nbplatform.stamp): Fixed to build on amd64 properly.
| author | Lillian Angel <langel@redhat.com> |
|---|---|
| date | Fri, 24 Apr 2009 14:09:22 -0400 |
| parents | dc69eba97b21 |
| children | 833e810f111b |
| files | Makefile.am |
| diffstat | 1 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.am Tue May 19 16:23:38 2009 +0100 +++ b/Makefile.am Fri Apr 24 14:09:22 2009 -0400 @@ -19,7 +19,7 @@ CACAO_VERSION = 0.99.4 CACAO_MD5SUM = 63220327925ace13756ae334c55a3baa -NETBEANS_PROFILER_MD5SUM = 786ab31817cbd902a7211cd6a6161750 +NETBEANS_PROFILER_MD5SUM = a6756a62291ebea5c0e2431389b31380 VISUALVM_MD5SUM = a289739f4a5bcdb9a2c642cfcc1e83fe if ENABLE_PLUGIN @@ -3241,18 +3241,20 @@ if WITH_VISUALVM cd netbeans ; \ rm nbbuild/external/binaries-list ; \ - mkdir -p lib.profiler/release/lib/deployed/jdk15/linux ; \ - mkdir -p lib.profiler/release/lib/deployed/jdk16/linux ; \ mkdir -p ./nbbuild/netbeans_visualvm/ ; \ ln -s $(SYSTEM_NETBEANS_DIR)/platform9/ ./nbbuild/netbeans_visualvm/platform9 ; \ ln -s $(SYSTEM_NETBEANS_DIR)/apisupport1/ ./nbbuild/netbeans_visualvm/apisupport1 ; \ ln -s $(SYSTEM_NETBEANS_DIR)/harness/ ./nbbuild/netbeans_visualvm/harness ; \ - cd lib.profiler/native/build ; \ if ! (uname -a | grep x86_64) ; then \ + mkdir -p lib.profiler/release/lib/deployed/jdk15/linux ; \ + mkdir -p lib.profiler/release/lib/deployed/jdk16/linux ; \ buildscript=./buildnative-linux-15.sh ; \ else \ + mkdir -p lib.profiler/release/lib/deployed/jdk15/linux-amd64 ; \ + mkdir -p lib.profiler/release/lib/deployed/jdk16/linux-amd64 ; \ buildscript=./buildnative-linux64-15.sh ; \ fi ; \ + cd lib.profiler/native/build ; \ JAVA_HOME_15=$(ICEDTEA_HOME) JAVA_HOME_16=$(ICEDTEA_HOME) \ $$buildscript ; \ cd ../../.. ; \