aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Su <asu@redhat.com>2010-10-26 12:01:22 -0400
committerAndrew Su <asu@redhat.com>2010-10-26 12:01:22 -0400
commit568b7cb608c1437280e5f907bdfec6775f8a9d39 (patch)
treea5c1a3c72a788bcde08f7bf67a2221ce05b83c90
parent72326a2118acab1abbeb62646bb37ac556ae1404 (diff)
Changed to use rmdir instead of rm -rf for launcher directory.
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.am4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c848eea..475d68d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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:
diff --git a/Makefile.am b/Makefile.am
index 50ef3c6..3dfff47 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -188,7 +188,9 @@ $(PLUGIN_DIR)/launcher/pluginappletviewer: $(PLUGIN_LAUNCHER_OBJECTS)
$(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 \