changeset in /hg/icedtea: Fix PulseAudio build.

[Andrew John Hughes]

changeset 2c18c20ea81c in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=2c18c20ea81c
description:
	Fix PulseAudio build.

	ChangeLog:

	2008-10-19  Andrew John Hughes  <gnu_andrew at member.fsf.org>

		* Makefile.am:
		Fix location of PulseAudio build output.

diffstat:

2 files changed, 8 insertions(+), 3 deletions(-)
ChangeLog   |    5 +++++
Makefile.am |    6 +++---

diffs (41 lines):

diff -r 6c315f0c65a5 -r 2c18c20ea81c ChangeLog
--- a/ChangeLog	Sun Oct 19 04:45:28 2008 +0100
+++ b/ChangeLog	Sun Oct 19 05:20:39 2008 +0100
@@ -1,3 +1,8 @@ 2008-10-19  Andrew John Hughes  <gnu_and
+2008-10-19  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	* Makefile.am:
+	Fix location of PulseAudio build output.
+	
 2008-10-19  Andrew John Hughes  <gnu_andrew at member.fsf.org>
 
 	* Makefile.am:
diff -r 6c315f0c65a5 -r 2c18c20ea81c Makefile.am
--- a/Makefile.am	Sun Oct 19 04:45:28 2008 +0100
+++ b/Makefile.am	Sun Oct 19 05:20:39 2008 +0100
@@ -33,7 +33,7 @@ PULSE_JAVA_DIR = $(srcdir)/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 =
@@ -1580,14 +1580,14 @@ if ENABLE_PULSE_JAVA
 	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\