This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "sfcb - Small Footprint CIM Broker".
The branch, master_1.3 has been updated
via cfcec8fefd2686b4c8e295821ac122655cf5adeb (commit)
from c44810d31eb20a32fceb80ba57a9ac9a17a9e4f7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit cfcec8fefd2686b4c8e295821ac122655cf5adeb
Author: Dave Heller <hel...@us...>
Date: Tue Jun 11 11:17:34 2013 -0400
[sfcb-tix:#55] make uninstall always remove sfcb.cfg
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index a49ded5..f28f436 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -590,18 +590,19 @@ install-sfcbconfDATA: $(sfcbconf_DATA)
echo " $(INSTALL_DATA) $$s $$f"; \
$(INSTALL_DATA) "$$s" "$$f"
-# If sfcb.cfg.new exists, uninstall that instead of sfcb.cfg
+# Remove sfcb.cfg.new, move sfcb.cfg to sfcb.cfg.saved
uninstall-sfcbconfDATA:
@f="$(DESTDIR)$(sfcbconfdir)/$(sfcbconf_DATA)"; \
if test -f "$$f".new; then \
+ echo " rm -f $$f".new; \
+ rm -f "$$f.new"; \
+ fi; \
+ if test -f "$$f"; then \
echo "**********************************************************************"; \
- echo "** removing $$f.new"; \
- echo "** preserving $$f"; \
+ echo "** moving $$f to $$f.saved"; \
+ mv "$$f" "$$f".saved; \
echo "**********************************************************************"; \
- f="$$f".new; \
- fi; \
- echo " rm -f $$f"; \
- rm -f "$$f"
+ fi
clean-local:
rm -f sfcbrepos sfcbstage sfcbunstage sfcbuuid sfcb.cfg getSchema.sh sfcb \
hooks/post-receive
--
sfcb - Small Footprint CIM Broker
|
