[Sblim-commit] sfcb Makefile.am,1.16,1.17

[Viktor M. <mih...@us...>]

Update of /cvsroot/sblim/sfcb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21612

Modified Files:
	Makefile.am 
Log Message:
Still on the package renaming issue: changed the explicit
install and uninstall operations to use the standard xxxdir
mechanism.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/sblim/sfcb/Makefile.am,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Makefile.am	27 Apr 2005 11:53:13 -0000	1.16
+++ Makefile.am	27 Apr 2005 17:09:56 -0000	1.17
@@ -20,6 +20,7 @@
 # 
 # 
 
+sfcbconfdir=$(sysconfdir)/sfcb
 sfcbstatedir=$(localstatedir)/lib/sfcb
 sfcbdocdir=$(datadir)/doc/$(PACKAGE)-$(VERSION)
 initdir=$(sysconfdir)/init.d
@@ -29,7 +30,7 @@
 
 AM_YFLAGS=-d
 
-AM_CPPFLAGS=-DSFCB_CONFDIR=\"$(sysconfdir)/sfcb\" \
+AM_CPPFLAGS=-DSFCB_CONFDIR=\"$(sfcbconfdir)\" \
 	-DSFCB_STATEDIR=\"$(sfcbstatedir)\"
 
 SUBDIRS=. $(MOFC_DIR)
@@ -160,6 +161,8 @@
 	sfcb.init-none.in \
 	regressionTests doc
 
+sfcbconf_DATA=sfcb.cfg
+
 dist_pkgdata_SCRIPTS=genSslCert.sh getSchema.sh
 
 dist_pkgdata_DATA=default.reg
@@ -168,6 +171,8 @@
 
 dist_bin_SCRIPTS=wbemcat
 
+init_SCRIPTS=sfcb
+
 sfcbrepos: sfcbrepos.sh
 	sed -e s?$$\{prefix\}?$(prefix)?g \
 	-e s?$$\{exec_prefix\}?$(prefix)?g $< > $@
@@ -188,7 +193,7 @@
 	sed -e s?$$\{prefix\}?$(prefix)?g \
 	-e s?$$\{exec_prefix\}?$(prefix)?g $< > $@
 
-sfcb.init: sfcb.$(INIT_STYLE)
+sfcb: sfcb.$(INIT_STYLE)
 	sed -e s?$$\{prefix\}?$(prefix)?g \
 	-e s?$$\{exec_prefix\}?$(prefix)?g $< > $@
 
@@ -198,9 +203,7 @@
 unittest:
 	cd test && sh check_all.sh
 
-install-data-local: sfcb.cfg
-	test -d $(DESTDIR)$(sysconfdir)/sfcb || $(mkdir_p) $(DESTDIR)$(sysconfdir)/sfcb
-	$(INSTALL_DATA) sfcb.cfg $(DESTDIR)$(sysconfdir)/sfcb
+install-data-local:
 	test -d $(DESTDIR)$(sfcbstatedir)/registration/repository || $(mkdir_p) $(DESTDIR)$(sfcbstatedir)/registration/repository
 	test -d $(DESTDIR)$(sfcbstatedir)/stage/mofs || $(mkdir_p) $(DESTDIR)$(sfcbstatedir)/stage/mofs
 	test -d $(DESTDIR)$(sfcbstatedir)/stage/regs || $(mkdir_p) $(DESTDIR)$(sfcbstatedir)/stage/regs
@@ -209,20 +212,16 @@
 	$(INSTALL_DATA) $(srcdir)/README $(srcdir)/AUTHORS $(srcdir)/COPYING $(DESTDIR)$(sfcbdocdir)
 	$(INSTALL_DATA) $(srcdir)/doc/sfcb.html $(DESTDIR)$(sfcbdocdir)
 
-install-exec-local:sfcb.init
-	test -d $(DESTDIR)$(initdir) || $(mkdir_p) $(DESTDIR)$(initdir)
-	$(INSTALL_SCRIPT) sfcb.init $(DESTDIR)$(initdir)/sfcb
-
 uninstall-local:
 	rm -f $(DESTDIR)$(sysconfdir)/sfcb/sfcb.cfg
 	rm -f $(DESTDIR)$(sfcbstatedir)/stage/default.reg
 	rm -f $(DESTDIR)$(sfcbdocdir)/*
-	rm -f $(DESTDIR)$(initdir)/sfcb
 	-rmdir $(sysconfdir)/sfcb
 	-rmdir $(sfcbdocdir)
 
 clean-local:
-	rm -f sfcbrepos sfcbstage sfcbunstage sfcb.cfg getSchema.sh sfcb.init
+	rm -f sfcbrepos sfcbstage sfcbunstage sfcb.cfg getSchema.sh sfcb.init \
+		sfcb.init-redhat sfcb.init-suse sfcb.init-none
 
 dist-hook:
 	test -d "$(distdir)" &&	rm -rf `find $(distdir) -type d -name CVS`