# HG changeset patch
# User Andrew John Hughes <ahughes@redhat.com>
# Date 1294448553 0
# Node ID afb288d37834c7abb20d69dc68a4861205e7087e
# Parent  97e73715aa7e8b805920b79cb65de38f0568c3ba
Make VisualVM work regardless of where it is installed.

2011-01-07  Andrew John Hughes  <ahughes@redhat.com>

	Make VisualVM work regardless of where it is
	installed.
	* Makefile.am:
	(NBPLATFORM_DIR_COPY): Removed.
	(install-exec-local): Install configuration
	to $(sysconfdir) rather than $(libdir)/visualvm/etc.
	Patch launcher with $(sysconfdir), platform directory,
	and $(libdir)/visualvm.  Patch visualvm.conf with jdkhome.
	Don't bother copying the platform symlink, just use the
	original location directly in the configuration file.

diff -r 97e73715aa7e -r afb288d37834 ChangeLog
--- a/ChangeLog	Fri Jan 07 16:24:38 2011 +0000
+++ b/ChangeLog	Sat Jan 08 01:02:33 2011 +0000
@@ -1,3 +1,16 @@
+2011-01-07  Andrew John Hughes  <ahughes@redhat.com>
+
+	Make VisualVM work regardless of where it is
+	installed.
+	* Makefile.am:
+	(NBPLATFORM_DIR_COPY): Removed.
+	(install-exec-local): Install configuration
+	to $(sysconfdir) rather than $(libdir)/visualvm/etc.
+	Patch launcher with $(sysconfdir), platform directory,
+	and $(libdir)/visualvm.  Patch visualvm.conf with jdkhome.
+	Don't bother copying the platform symlink, just use the
+	original location directly in the configuration file.
+
 2011-01-07  Jiri Vanek <jvanek@redhat.com>
 
 	* visualvm.desktop.in:
diff -r 97e73715aa7e -r afb288d37834 Makefile.am
--- a/Makefile.am	Fri Jan 07 16:24:38 2011 +0000
+++ b/Makefile.am	Sat Jan 08 01:02:33 2011 +0000
@@ -30,7 +30,6 @@
   VISUALVM_SRC_ZIP=$(VISUALVM_131_SRC_ZIP)
   VISUALVM_SHA256SUM=$(VISUALVM_131_SHA256SUM)
   NBPLATFORM_DIR=netbeans/nbbuild/netbeans_visualvm/platform
-  NBPLATFORM_DIR_COPY=$(NBPLATFORM_DIR)
   ADDITIONAL_DIRS=profiler.oql
   PROFILER=profiler
 else
@@ -42,7 +41,6 @@
   VISUALVM_SRC_ZIP=$(VISUALVM_13_SRC_ZIP)
   VISUALVM_SHA256SUM=$(VISUALVM_13_SHA256SUM)
   NBPLATFORM_DIR=netbeans/nbbuild/netbeans_visualvm/platform
-  NBPLATFORM_DIR_COPY=$(NBPLATFORM_DIR)
   ADDITIONAL_DIRS=profiler.oql
   PROFILER=profiler
 else
@@ -53,7 +51,6 @@
   VISUALVM_SRC_ZIP=$(VISUALVM_122_SRC_ZIP)
   VISUALVM_SHA256SUM=$(VISUALVM_122_SHA256SUM)
   NBPLATFORM_DIR=netbeans/nbbuild/netbeans_visualvm
-  NBPLATFORM_DIR_COPY=$(NBPLATFORM_DIR)/$(NB_PLATFORM)
   NBBUILD_PROPERTIES=-Dpermit.jdk6.builds=true -Dbuildnumber=091221-4fc006d17cb1
   PROFILER=profiler3
 endif
@@ -198,18 +195,22 @@
 
 install-exec-local:
 	mkdir -p $(DESTDIR)$(bindir)
-	mkdir -p $(DESTDIR)$(libdir)/visualvm/etc
+	mkdir -p $(DESTDIR)$(sysconfdir)
 	mkdir -p $(DESTDIR)$(libdir)/visualvm/visualvm
 	mkdir -p $(DESTDIR)$(datadir)
-	sed "s/APPNAME=\`basename.*\`/APPNAME=visualvm/" \
-	  visualvm/launcher/visualvm >> \
+	cat visualvm/launcher/visualvm | \
+	  sed "s:APPNAME=\`basename.*\`:APPNAME=visualvm:" | \
+	  sed "s:\$$BASEDIR/etc:$(sysconfdir):" | \
+	  sed "s:\$$BASEDIR/\$$X:$(libdir)/visualvm/\$$X:" | \
+	  sed "s:^nbexec=.*:nbexec=$(SYSTEM_NETBEANS_DIR)/$(NB_PLATFORM)/lib/nbexec:" > \
 	  $(DESTDIR)$(bindir)/jvisualvm
 	chmod a+x $(DESTDIR)$(bindir)/jvisualvm
-	cp visualvm/launcher/visualvm.conf $(DESTDIR)$(libdir)/visualvm/etc
-	echo visualvm >> $(DESTDIR)$(libdir)/visualvm/etc/visualvm.clusters
-	echo $(PROFILER) >> $(DESTDIR)$(libdir)/visualvm/etc/visualvm.clusters
+	sed -e "s:^#jdkhome=.*:jdkhome=\"$(SYSTEM_JDK_DIR)\"":g \
+	  visualvm/launcher/visualvm.conf > \
+	  $(DESTDIR)$(sysconfdir)/visualvm.conf
+	echo visualvm >> $(DESTDIR)$(sysconfdir)/visualvm.clusters
+	echo $(PROFILER) >> $(DESTDIR)$(sysconfdir)/visualvm.clusters
 	cp -r visualvm/build/cluster/* $(DESTDIR)$(libdir)/visualvm/visualvm
-	cp -r $(NBPLATFORM_DIR_COPY) $(DESTDIR)$(libdir)/visualvm
 	cp -r netbeans/nbbuild/netbeans_visualvm/$(PROFILER) $(DESTDIR)$(libdir)/visualvm	
 	cp visualvm.desktop $(DESTDIR)$(datadir)