Mercurial > hg > release > icedtea-web-1.0

changeset 17:dfd749c077c3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Changed to use rmdir instead of rm -rf for launcher directory.
author Andrew Su <asu@redhat.com>
date Tue, 26 Oct 2010 12:01:22 -0400
parents b1b876d99849
children d4a914a000e3
files ChangeLog Makefile.am
diffstat 2 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Oct 25 17:16:13 2010 -0400
+++ b/ChangeLog	Tue Oct 26 12:01:22 2010 -0400
@@ -1,3 +1,8 @@
+2010-10-26  Andrew Su  <asu@redhat.com>
+
+	* Makefile.am: Split rm -rf into rm -f and rmdir for launcher
+	directory.
+
 2010-10-25  Omair Majid  <omajid@redhat.com>
 
 	* netx/net/sourceforge/jnlp/ShortcutDesc.java:
--- a/Makefile.am	Mon Oct 25 17:16:13 2010 -0400
+++ b/Makefile.am	Tue Oct 26 12:01:22 2010 -0400
@@ -188,7 +188,9 @@
 	$(CC) $(LAUNCHER_LINK) $(PLUGIN_LAUNCHER_OBJECTS)
 
 clean-IcedTeaPlugin:
-	rm -rf $(PLUGIN_DIR)/launcher
+	rm -f $(PLUGIN_DIR)/launcher/*.o
+	rm -f $(PLUGIN_DIR)/launcher/pluginappletviewer
+	rmdir $(PLUGIN_DIR)/launcher
 	rm -f $(PLUGIN_DIR)/*.o
 	rm -f $(PLUGIN_DIR)/IcedTeaPlugin.so
 	if [ $(abs_top_srcdir) != $(abs_top_builddir) ]; then \