Mercurial > hg > release > visualvm-1.3
changeset 3:1ecd7fe24740
Fix installation into DESTDIR, remove unused VV_FIND_NETBEANS
(the netbeans binary is not needed for the build).
2010-08-26 Matthias Klose <doko@ubuntu.com>
* Makefile.am (install-exec-local): Honor DESTDIR.
* acinclude.a4: Remove VV_FIND_NETBEANS check.
* configure.ac: Don't call VV_FIND_NETBEANS.
| author | doko@ubuntu.com |
|---|---|
| date | Thu, 26 Aug 2010 18:25:49 +0200 |
| parents | 7562d9776311 |
| children | b1df771a3be3 |
| files | ChangeLog Makefile.am acinclude.m4 configure.ac |
| diffstat | 4 files changed, 20 insertions(+), 47 deletions(-) [+] |
line wrap: on
line diff
--- 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-08-26 Matthias Klose <doko@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@redhat.com> * Makefile.am: Install visualvm.desktop
--- 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 @@ 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 @@ nbplatform: stamps/nbplatform.stamp -visualvm: stamps/visualvm.stamp \ No newline at end of file +visualvm: stamps/visualvm.stamp
--- 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_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)