/hg/visualvm: Fix installation into DESTDIR, remove unused VV_FI...

[doko at icedtea.classpath.org]

changeset 1ecd7fe24740 in /hg/visualvm
details: http://icedtea.classpath.org/hg/visualvm?cmd=changeset;node=1ecd7fe24740
author: doko at ubuntu.com
date: Thu Aug 26 18:25:49 2010 +0200

	Fix installation into DESTDIR, remove unused VV_FIND_NETBEANS (the
	netbeans binary is not needed for the build).

	2010-08-26 Matthias Klose <doko at ubuntu.com>

	 * Makefile.am (install-exec-local): Honor DESTDIR.
	        * acinclude.a4: Remove VV_FIND_NETBEANS check.
	        * configure.ac: Don't call VV_FIND_NETBEANS.


diffstat:

4 files changed, 20 insertions(+), 47 deletions(-)
ChangeLog    |    6 ++++++
Makefile.am  |   28 ++++++++++++++--------------
acinclude.m4 |   32 --------------------------------
configure.ac |    1 -

diffs (107 lines):

diff -r 7562d9776311 -r 1ecd7fe24740 ChangeLog
--- a/ChangeLog	Wed Jun 23 00:39:07 2010 +0100
+++ b/ChangeLog	Thu Aug 26 18:25:49 2010 +0200
@@ -1,3 +1,9 @@ 2010-06-23  Andrew John Hughes  <ahughes
+2010-08-26  Matthias Klose  <doko at ubuntu.com>
+
+	* Makefile.am (install-exec-local): Honor DESTDIR.
+	* acinclude.a4: Remove VV_FIND_NETBEANS check.
+	* configure.ac: Don't call VV_FIND_NETBEANS.
+
 2010-06-23  Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am: Install visualvm.desktop
diff -r 7562d9776311 -r 1ecd7fe24740 Makefile.am
--- a/Makefile.am	Wed Jun 23 00:39:07 2010 +0100
+++ b/Makefile.am	Thu Aug 26 18:25:49 2010 +0200
@@ -143,21 +143,21 @@ clean-visualvm:
 	rm -f stamps/visualvm.stamp
 
 install-exec-local:
-	mkdir -p $(bindir)
-	mkdir -p $(libdir)/visualvm/etc
-	mkdir -p $(libdir)/visualvm/visualvm
-	mkdir -p $(datadir)
+	mkdir -p $(DESTDIR)$(bindir)
+	mkdir -p $(DESTDIR)$(libdir)/visualvm/etc
+	mkdir -p $(DESTDIR)$(libdir)/visualvm/visualvm
+	mkdir -p $(DESTDIR)$(datadir)
 	sed "s/APPNAME=\`basename.*\`/APPNAME=visualvm/" \
 	  visualvm/launcher/visualvm >> \
-	  $(bindir)/jvisualvm
-	chmod a+x $(bindir)/jvisualvm
-	cp visualvm/launcher/visualvm.conf $(libdir)/visualvm/etc
-	echo visualvm >> $(libdir)/visualvm/etc/visualvm.clusters
-	echo profiler3 >> $(libdir)/visualvm/etc/visualvm.clusters
-	cp -r visualvm/build/cluster/* $(libdir)/visualvm/visualvm
-	cp -r netbeans/nbbuild/netbeans_visualvm/$(NB_PLATFORM) $(libdir)/visualvm
-	cp -r netbeans/nbbuild/netbeans_visualvm/profiler3 $(libdir)/visualvm	
-	cp visualvm.desktop $(datadir)
+	  $(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
+	cp -r visualvm/build/cluster/* $(DESTDIR)$(libdir)/visualvm/visualvm
+	cp -r netbeans/nbbuild/netbeans_visualvm/platform $(DESTDIR)$(libdir)/visualvm
+	cp -r netbeans/nbbuild/netbeans_visualvm/profiler $(DESTDIR)$(libdir)/visualvm	
+	cp visualvm.desktop $(DESTDIR)$(datadir)
 
 download-netbeans-profiler: stamps/download-netbeans-profiler.stamp
 
@@ -169,4 +169,4 @@ extract-visualvm: stamps/extract-visualv
 
 nbplatform: stamps/nbplatform.stamp
 
-visualvm: stamps/visualvm.stamp
\ No newline at end of file
+visualvm: stamps/visualvm.stamp
diff -r 7562d9776311 -r 1ecd7fe24740 acinclude.m4
--- a/acinclude.m4	Wed Jun 23 00:39:07 2010 +0100
+++ b/acinclude.m4	Thu Aug 26 18:25:49 2010 +0200
@@ -1,35 +1,3 @@ AC_DEFUN([VV_FIND_NETBEANS],
-AC_DEFUN([VV_FIND_NETBEANS],
-[
-  AC_MSG_CHECKING([if the location of NetBeans is specified])
-  AC_ARG_WITH([netbeans],
-              [AS_HELP_STRING(--with-netbeans,specify location of netbeans)],
-  [
-    if test "x${withval}" = "xyes"; then
-      NETBEANS=no
-    else
-      NETBEANS="${withval}"
-    fi
-  ],
-  [
-    NETBEANS=no
-  ])
-  AC_MSG_RESULT(${NETBEANS})
-  if ! test -f "${NETBEANS}"; then
-    if test "x${NETBEANS}" = "xno"; then
-      NETBEANS=
-    else
-      AC_PATH_PROG(NETBEANS, "${NETBEANS}")
-    fi
-  fi
-  if test -z "${NETBEANS}"; then
-    AC_PATH_PROG(NETBEANS, "netbeans")
-  fi
-  if test -z "${NETBEANS}"; then
-    AC_MSG_ERROR("NetBeans was not found.")
-  fi
-  AC_SUBST(NETBEANS)
-])
-
 AC_DEFUN([VV_WITH_NETBEANS_PROFILER_ZIP],
 [
   AC_MSG_CHECKING(for a NetBeans profiler zip)
diff -r 7562d9776311 -r 1ecd7fe24740 configure.ac
--- a/configure.ac	Wed Jun 23 00:39:07 2010 +0100
+++ b/configure.ac	Thu Aug 26 18:25:49 2010 +0200
@@ -40,6 +40,5 @@ VV_SET_ARCH_SETTINGS
 VV_SET_ARCH_SETTINGS
 VV_WITH_NETBEANS_PROFILER_ZIP
 VV_WITH_VISUALVM_ZIP
-VV_FIND_NETBEANS
 
 AC_OUTPUT