Mercurial > hg > release > icedtea6-1.8

changeset 1133:1fddd063617e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix paths. 2008-10-20 Andrew John Hughes <gnu_andrew@member.fsf.org> * Makefile.am: Fix LiveConnect and PulseAudio paths to work when srcdir != builddir.
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Mon, 20 Oct 2008 12:25:28 +0100
parents a4df7fa32706
children 7f335937eca4
files ChangeLog Makefile.am
diffstat 2 files changed, 12 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Oct 20 11:05:12 2008 +0100
+++ b/ChangeLog	Mon Oct 20 12:25:28 2008 +0100
@@ -1,3 +1,9 @@
+2008-10-20  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	* Makefile.am:
+	Fix LiveConnect and PulseAudio paths to work
+	when srcdir != builddir.
+
 2008-10-20  Alon Bar-Lev  <alon.barlev@gmail.com>
 
 	PR icedtea/224:
--- a/Makefile.am	Mon Oct 20 11:05:12 2008 +0100
+++ b/Makefile.am	Mon Oct 20 12:25:28 2008 +0100
@@ -30,10 +30,10 @@
 
 if ENABLE_PULSE_JAVA
 # include the makefile in pulseaudio subdir
-PULSE_JAVA_DIR = pulseaudio
+PULSE_JAVA_DIR = $(srcdir)/pulseaudio
 PULSE_JAVA_NATIVE_SRCDIR = $(PULSE_JAVA_DIR)/src/native
 PULSE_JAVA_JAVA_SRCDIR = $(PULSE_JAVA_DIR)/src/java
-PULSE_JAVA_CLASS_DIR = $(PULSE_JAVA_DIR)/bin
+PULSE_JAVA_CLASS_DIR = $(abs_top_builddir)/pulseaudio
 else 
 PULSE_JAVA_DIR =
 PULSE_JAVA_NATIVE_SRCDIR =
@@ -639,8 +639,8 @@
 	sed -i "s#IcedTea6#IcedTea6 $${icedtea_version}#" openjdk/jdk/make/common/shared/Defs.gmk
 
 if ENABLE_PLUGIN
-	cp -a plugin/icedtea/sun/applet/*java openjdk/jdk/src/share/classes/sun/applet/
-	cp -a plugin/icedtea/netscape rt/
+	cp -a $(srcdir)/plugin/icedtea/sun/applet/*java openjdk/jdk/src/share/classes/sun/applet/
+	cp -a $(srcdir)/plugin/icedtea/netscape rt/
 endif
 
 clean-patch:
@@ -1469,14 +1469,14 @@
 	if ! test -d $(ICEDTEA_BOOT_DIR) ; \
 	then \
 		(cd $(PULSE_JAVA_JAVA_SRCDIR); \
-		 $(JAVAC) -d ../../../$(PULSE_JAVA_CLASS_DIR) \
+		 $(JAVAC) -d $(PULSE_JAVA_CLASS_DIR) \
 		-bootclasspath  \
 	        '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_builddir)/generated' \
 		org/classpath/icedtea/pulseaudio/*.java\
 		) \
         else \
 		(cd $(PULSE_JAVA_JAVA_SRCDIR); \
-		$(ICEDTEA_BOOT_DIR)/bin/javac -d ../../../$(PULSE_JAVA_CLASS_DIR)\
+		$(ICEDTEA_BOOT_DIR)/bin/javac -d $(PULSE_JAVA_CLASS_DIR)\
 		-bootclasspath \
 	        '$(ICEDTEA_BOOT_DIR)/jre/lib/rt.jar' \
 		org/classpath/icedtea/pulseaudio/*.java\