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 has been updated
via 10ae1a730dd4e58ec36f3fbc38203692aa64e8d2 (commit)
from c4bb84b4949ec151dda40e953dfc20aa9e908958 (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 10ae1a730dd4e58ec36f3fbc38203692aa64e8d2
Author: Dave Heller <hel...@us...>
Date: Tue Jun 4 11:09:40 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 044a7b8..68aa837 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -510,6 +510,37 @@ if TEST_ENABLED
./test/stageschema.sh -d test/schema -p $(prefix) -u
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 08adb9d..9757e84 100644
--- a/sfcb.spec.in
+++ b/sfcb.spec.in
@@ -84,7 +84,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
|
