r21531 - gnucash-docs/trunk - Fix uninstall error introduced by r21467
Geert Janssens
gjanssens at code.gnucash.org
Mon Nov 7 10:25:12 EST 2011
Author: gjanssens
Date: 2011-11-07 10:25:12 -0500 (Mon, 07 Nov 2011)
New Revision: 21531
Trac: http://svn.gnucash.org/trac/changeset/21531
Modified:
gnucash-docs/trunk/omf.make
Log:
Fix uninstall error introduced by r21467
Modified: gnucash-docs/trunk/omf.make
===================================================================
--- gnucash-docs/trunk/omf.make 2011-11-07 14:41:57 UTC (rev 21530)
+++ gnucash-docs/trunk/omf.make 2011-11-07 15:25:12 UTC (rev 21531)
@@ -40,7 +40,7 @@
install-data-hook-omf:
$(mkinstalldirs) "$(DESTDIR)$(omf_dest_dir)"
for file in $(omffile); do \
- omfdir="$(DESTDIR)$(omf_dest_dir)/`echo $$file | sed 's/-[^-]*\.omf$$//'`"; \
+ omfdir="$(DESTDIR)$(omf_dest_dir)/`echo $$file | sed 's/-[^-]*\.omf$$//'`"; \
$(mkinstalldirs) "$$omfdir"; \
$(INSTALL_DATA) "$$file.out" "$$omfdir/$$file"; \
if test "x$(_ENABLE_SK)" = "xtrue"; then \
@@ -50,11 +50,11 @@
uninstall-local-omf:
for file in $(omffile); do \
- omfdir="$(DESTDIR)$(omf_dest_dir)/`echo $$file | sed 's/-[^-]*\.omf$$//'`"; \
+ omfdir="$(DESTDIR)$(omf_dest_dir)/`echo $$file | sed 's/-[^-]*\.omf$$//'`"; \
if test "x$(_ENABLE_SK)" == "xtrue"; then \
scrollkeeper-uninstall -p "$(scrollkeeper_localstate_dir)" "$$omfdir/$$file"; \
fi; \
rm -f "$$omfdir/$$file"; \
- rmdir "$$omfdir"; \
+ rmdir --ignore-fail-on-non-empty "$$omfdir"; \
done;
More information about the gnucash-changes
mailing list