/hg/icedtea-web: allow running make clean multiple times
omajid at icedtea.classpath.org
omajid at icedtea.classpath.org
Mon Nov 1 08:47:37 PDT 2010
changeset 6c2527d42900 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=6c2527d42900
author: Omair Majid <omajid at redhat.com>
date: Mon Nov 01 11:44:15 2010 -0400
allow running make clean multiple times
2010-11-01 Omair Majid <omajid at redhat.com>
* Makefile.am (clean-IcedTeaPlugin): Only delete launcher
directory if it exists.
diffstat:
2 files changed, 8 insertions(+), 1 deletion(-)
ChangeLog | 5 +++++
Makefile.am | 4 +++-
diffs (26 lines):
diff -r df3cf32781d3 -r 6c2527d42900 ChangeLog
--- a/ChangeLog Mon Nov 01 11:41:59 2010 -0700
+++ b/ChangeLog Mon Nov 01 11:44:15 2010 -0400
@@ -1,3 +1,8 @@ 2010-11-01 Deepak Bhole <dbhole at redhat.
+2010-11-01 Omair Majid <omajid at redhat.com>
+
+ * Makefile.am (clean-IcedTeaPlugin): Only delete launcher directory if it
+ exists.
+
2010-11-01 Deepak Bhole <dbhole at redhat.com>
PR542: Plugin fails with NPE on
diff -r df3cf32781d3 -r 6c2527d42900 Makefile.am
--- a/Makefile.am Mon Nov 01 11:41:59 2010 -0700
+++ b/Makefile.am Mon Nov 01 11:44:15 2010 -0400
@@ -190,7 +190,9 @@ clean-IcedTeaPlugin:
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 \
More information about the distro-pkg-dev
mailing list