[Sblim-commit] Git: sfcb - Small Footprint CIM Broker branch, master_1.3, updated. c44810d31eb20a32fceb80ba57a9ac9a17a9e4f7

[Dave H. <hel...@us...>]

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  c44810d31eb20a32fceb80ba57a9ac9a17a9e4f7 (commit)
      from  a4bda05412b66be11493bddcece7dc727a1c0908 (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 c44810d31eb20a32fceb80ba57a9ac9a17a9e4f7
Author: Dave Heller <hel...@us...>
Date:   Tue Jun 4 11:09:36 2013 -0400

    [sfcb-tix:#55] make install should not overwrite sfcb.cfg

-----------------------------------------------------------------------

Summary of changes:
 Makefile.am  |   31 +++++++++++++++++++++++++++++++
 sfcb.spec.in |    3 ++-
 sfcbproc.c   |    2 +-
 3 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index f6b0184..a49ded5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -572,6 +572,37 @@ if DOCS
 	rm -rf $(DESTDIR)$(sfcbdocdir)/html
 endif
 
+# If sfcb.cfg already exists, install as sfcb.cfg.new
+install-sfcbconfDATA: $(sfcbconf_DATA)
+	@test -z "$(sfcbconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sfcbconfdir)"; \
+	s="$(srcdir)/sfcb.cfg"; \
+	f="$(DESTDIR)$(sfcbconfdir)/$(sfcbconf_DATA)"; \
+	if test -f "$$f"; then \
+		if ! diff -wB "$$s" "$$f" >/dev/null 2>/dev/null; then \
+			echo "**********************************************************************"; \
+			echo "** existing config $$f preserved"; \
+			echo "** new config installed as $$f.new"; \
+			echo "** (you may want to merge config files when updating SFCB version)"; \
+			echo "**********************************************************************"; \
+			f="$$f".new; \
+		fi; \
+	fi; \
+	echo " $(INSTALL_DATA) $$s $$f"; \
+	$(INSTALL_DATA) "$$s" "$$f"
+
+# If sfcb.cfg.new exists, uninstall that instead of sfcb.cfg
+uninstall-sfcbconfDATA:
+	@f="$(DESTDIR)$(sfcbconfdir)/$(sfcbconf_DATA)"; \
+	if test -f "$$f".new; then \
+		echo "**********************************************************************"; \
+		echo "** removing $$f.new"; \
+		echo "** preserving $$f"; \
+		echo "**********************************************************************"; \
+		f="$$f".new; \
+	fi; \
+	echo " rm -f $$f"; \
+	rm -f "$$f"
+
 clean-local:
 	rm -f sfcbrepos sfcbstage sfcbunstage sfcbuuid sfcb.cfg getSchema.sh sfcb \
 		sfcb.init-redhat sfcb.init-suse sfcb.init-none sfcb-dox.conf \
diff --git a/sfcb.spec.in b/sfcb.spec.in
index 7c8ba0e..d0c8d88 100644
--- a/sfcb.spec.in
+++ b/sfcb.spec.in
@@ -82,7 +82,8 @@ echo "%{_sysconfdir}/init.d/sfcb" >> _pkg_list
 echo "%{_localstatedir}/lib/sfcb" >> _pkg_list
 echo "%{_bindir}/*" >> _pkg_list
 echo "%{_sbindir}/*" >> _pkg_list
-echo "%{_libdir}/*.so*" >> _pkg_list
+echo "%{_libdir}/sfcb/*.so*" >> _pkg_list
+echo "%{_libdir}/sfcb/*.la*" >> _pkg_list
 
 echo =======================================
 cat _pkg_list
diff --git a/sfcbproc.c b/sfcbproc.c
index 94ad542..ae2c8a5 100644
--- a/sfcbproc.c
+++ b/sfcbproc.c
@@ -674,5 +674,5 @@ int main(int argc, char **argv) {
 
     printf("%5d %5d %5d %-4c %s\n", p->pid, p->ppid, p->pgrp, p->state, role);
   }
-  _exit(0);
+  exit(0);
 }


hooks/post-receive
-- 
sfcb - Small Footprint CIM Broker