Mercurial > hg > release > icedtea7-2.2

changeset 2290:a7b8e4ae90c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Always check for existence before using rmdir. Give the PulseAudio build directory a different name from the source directory. 2010-07-16 Andrew John Hughes <ahughes@redhat.com> * Makefile.am: (clean-IcedTeaPlugin): Always check for existence before using rmdir. (clean-pulse-java): Likewise. 2010-07-06 Andrew John Hughes <ahughes@redhat.com> * Makefile.am: (PULSE_JAVA_BUILDDIR): Use a different name from the source directory to avoid confusion.
author Andrew John Hughes <ahughes@redhat.com>
date Fri, 16 Jul 2010 19:59:59 +0100
parents 99972c76b4ef
children e63ec10f8b3d
files ChangeLog Makefile.am
diffstat 2 files changed, 22 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Jul 16 19:54:08 2010 +0100
+++ b/ChangeLog	Fri Jul 16 19:59:59 2010 +0100
@@ -1,3 +1,16 @@
+2010-07-16  Andrew John Hughes  <ahughes@redhat.com>
+
+	* Makefile.am:
+	(clean-IcedTeaPlugin): Always check for existence
+	before using rmdir.
+	(clean-pulse-java): Likewise.
+
+2010-07-06  Andrew John Hughes  <ahughes@redhat.com>
+
+	* Makefile.am:
+	(PULSE_JAVA_BUILDDIR): Use a different name from
+	the source directory to avoid confusion.
+
 2010-07-16  Andrew John Hughes  <ahughes@redhat.com>
 
 	Make variable naming clearer.  Replace bootstrap/boot,
--- a/Makefile.am	Fri Jul 16 19:54:08 2010 +0100
+++ b/Makefile.am	Fri Jul 16 19:59:59 2010 +0100
@@ -195,7 +195,7 @@
 PULSE_JAVA_DIR = $(abs_top_srcdir)/pulseaudio
 PULSE_JAVA_NATIVE_SRCDIR = $(PULSE_JAVA_DIR)/src/native
 PULSE_JAVA_NATIVE_SRCS = $(wildcard $(PULSE_JAVA_NATIVE_SRCDIR)/*.c)
-PULSE_JAVA_BUILDDIR = $(abs_top_builddir)/pulseaudio
+PULSE_JAVA_BUILDDIR = $(abs_top_builddir)/pulseaudio.build
 PULSE_JAVA_NATIVE_BUILDDIR = $(PULSE_JAVA_BUILDDIR)/native
 PULSE_JAVA_NATIVE_OBJECTS = \
 	$(subst $(PULSE_JAVA_NATIVE_SRCDIR),$(PULSE_JAVA_NATIVE_BUILDDIR),$(patsubst %.c,%.o,$(PULSE_JAVA_NATIVE_SRCS)))
@@ -2003,8 +2003,12 @@
 clean-IcedTeaPlugin:
 	rm -f $(addprefix $(PLUGIN_BUILD_DIR)/,$(PLUGIN_OBJECTS))
 	rm -f $(PLUGIN_BUILD_DIR)/IcedTeaNPPlugin.so
-	rmdir $(PLUGIN_BUILD_DIR)
-	rmdir plugin.build
+	if [ -e $(PLUGIN_BUILD_DIR) ] ; then \
+		rmdir $(PLUGIN_BUILD_DIR) ; \
+	fi
+	if [ -e plugin.build ] ; then \
+		rmdir plugin.build ; \
+	fi
 	rm -f stamps/icedtea-npplugin.stamp
 endif
 
@@ -2168,8 +2172,8 @@
 	[ -z "$(PULSE_JAVA_NATIVE_BUILDDIR)" ] || rm -rf $(PULSE_JAVA_NATIVE_BUILDDIR)
 	[ -z "$(PULSE_JAVA_CLASS_DIR)" ] || rm -rf $(PULSE_JAVA_CLASS_DIR)
 	rm -f pulse-java.jar
-	if [ $(abs_top_srcdir) != $(abs_top_builddir) ]; then \
-	  rmdir $(abs_top_builddir)/pulseaudio ; \
+	if [ -e $(PULSE_JAVA_BUILDDIR) ]; then \
+	  rmdir $(PULSE_JAVA_BUILDDIR) ; \
 	fi
 endif
 	rm -f stamps/pulse-java*.stamp