aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.am4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b366d6a..d49d9dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-01 Omair Majid <[email protected]>
+
+ * Makefile.am (clean-IcedTeaPlugin): Only delete launcher directory if it
+ exists.
+
2010-11-01 Deepak Bhole <[email protected]>
PR542: Plugin fails with NPE on
diff --git a/Makefile.am b/Makefile.am
index 3dfff47..d6b3c46 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -190,7 +190,9 @@ $(PLUGIN_DIR)/launcher/pluginappletviewer: $(PLUGIN_LAUNCHER_OBJECTS)
clean-IcedTeaPlugin:
rm -f $(PLUGIN_DIR)/launcher/*.o
rm -f $(PLUGIN_DIR)/launcher/pluginappletviewer
- rmdir $(PLUGIN_DIR)/launcher
+ if [ -e $(PLUGIN_DIR)/launcher ]; then \
+ rmdir $(PLUGIN_DIR)/launcher ; \
+ fi
rm -f $(PLUGIN_DIR)/*.o
rm -f $(PLUGIN_DIR)/IcedTeaPlugin.so
if [ $(abs_top_srcdir) != $(abs_top_builddir) ]; then \