Mercurial > hg > release > icedtea-web-1.2
changeset 30:6c2527d42900
allow running make clean multiple times
2010-11-01 Omair Majid <omajid@redhat.com>
* Makefile.am (clean-IcedTeaPlugin): Only delete launcher directory if it
exists.
| author | Omair Majid <omajid@redhat.com> |
|---|---|
| date | Mon, 01 Nov 2010 11:44:15 -0400 |
| parents | df3cf32781d3 |
| children | 30efa2ff349b |
| files | ChangeLog Makefile.am |
| diffstat | 2 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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 Omair Majid <omajid@redhat.com> + + * Makefile.am (clean-IcedTeaPlugin): Only delete launcher directory if it + exists. + 2010-11-01 Deepak Bhole <dbhole@redhat.com> PR542: Plugin fails with NPE on
--- 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: 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 \