# HG changeset patch
# User Andrew John Hughes <ahughes@redhat.com>
# Date 1283973752 -3600
# Node ID 8b1172973c70ab07f27468f719b6b34c96586779
# Parent  37857184a6d9f30ab163b3791ad286453de8d1d5
Set NB_PLATFORM to a relative path as before.

2010-09-08  Andrew John Hughes  <ahughes@redhat.com>

	* Makefile.am:
	(nbplatform): Remove trailing slash.
	* acinclude.m4:
	(VV_CHECK_FOR_NETBEANS): Set NB_PLATFORM to
	a relative path.

diff -r 37857184a6d9 -r 8b1172973c70 ChangeLog
--- a/ChangeLog	Wed Sep 08 20:08:55 2010 +0100
+++ b/ChangeLog	Wed Sep 08 20:22:32 2010 +0100
@@ -1,3 +1,11 @@
+2010-09-08  Andrew John Hughes  <ahughes@redhat.com>
+
+	* Makefile.am:
+	(nbplatform): Remove trailing slash.
+	* acinclude.m4:
+	(VV_CHECK_FOR_NETBEANS): Set NB_PLATFORM to
+	a relative path.
+
 2010-09-08  Andrew John Hughes  <ahughes@redhat.com>
 
 	PR546:
diff -r 37857184a6d9 -r 8b1172973c70 Makefile.am
--- a/Makefile.am	Wed Sep 08 20:08:55 2010 +0100
+++ b/Makefile.am	Wed Sep 08 20:22:32 2010 +0100
@@ -143,7 +143,7 @@
 stamps/nbplatform.stamp: stamps/extract-netbeans-profiler.stamp
 	rm -f netbeans/nbbuild/external/binaries-list 
 	mkdir -p netbeans/nbbuild/netbeans_visualvm/
-	ln -s $(SYSTEM_NETBEANS_DIR)/$(NB_PLATFORM)/ $(NBPLATFORM_DIR)
+	ln -s $(SYSTEM_NETBEANS_DIR)/$(NB_PLATFORM) $(NBPLATFORM_DIR)
 	ln -s $(SYSTEM_NETBEANS_DIR)/harness/ netbeans/nbbuild/netbeans_visualvm
 	mkdir -p netbeans/lib.profiler/release/lib/deployed/jdk15/linux-amd64
 	mkdir -p netbeans/lib.profiler/release/lib/deployed/jdk16/linux-amd64
diff -r 37857184a6d9 -r 8b1172973c70 acinclude.m4
--- a/acinclude.m4	Wed Sep 08 20:08:55 2010 +0100
+++ b/acinclude.m4	Wed Sep 08 20:22:32 2010 +0100
@@ -150,12 +150,12 @@
 AC_MSG_RESULT([${SYSTEM_NETBEANS_DIR}])
 AC_SUBST(SYSTEM_NETBEANS_DIR)
 if test "$VVVERSION" = "1.3"; then
-   NB_PLATFORM=${SYSTEM_NETBEANS_DIR}/platform12;
+   NB_PLATFORM=platform12;
 else
-   NB_PLATFORM=${SYSTEM_NETBEANS_DIR}/platform11;
+   NB_PLATFORM=platform11;
 fi
-if ! test -d ${NB_PLATFORM} ; then
-  AC_MSG_ERROR([Couldn't find NetBeans platform directory: ${NB_PLATFORM}])
+if ! test -d ${SYSTEM_NETBEANS_DIR}/${NB_PLATFORM} ; then
+  AC_MSG_ERROR([Couldn't find NetBeans platform directory: ${SYSTEM_NETBEANS_DIR}/${NB_PLATFORM}])
 fi
 AC_SUBST([NB_PLATFORM])
 ])