[Sblim-commit] sfcb Makefile.am,1.17,1.18 sfcb.spec.in,1.9,1.10 sfcbrepos.sh.in,1.7,1.8

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

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

Modified Files:
	Makefile.am sfcb.spec.in sfcbrepos.sh.in 
Log Message:
Oner more shot at renaming: uses sfcb instead of sblim-sfcb for all
install directories.


Index: sfcb.spec.in
===================================================================
RCS file: /cvsroot/sblim/sfcb/sfcb.spec.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- sfcb.spec.in	27 Apr 2005 11:53:13 -0000	1.9
+++ sfcb.spec.in	27 Apr 2005 17:48:29 -0000	1.10
@@ -57,7 +57,7 @@
 
 echo "%defattr(-,root,root)" > _pkg_list
 
-find $RPM_BUILD_ROOT/%{_datadir}/%{name} -type f | grep -v $RPM_BUILD_ROOT/%{_datadir}/%{name}/CIM >> _pkg_list
+find $RPM_BUILD_ROOT/%{_datadir}/sfcb -type f | grep -v $RPM_BUILD_ROOT/%{_datadir}/sfcb/CIM >> _pkg_list
 sed s?$RPM_BUILD_ROOT??g _pkg_list > _pkg_list_2
 mv -f _pkg_list_2 _pkg_list
 echo "%config %{_sysconfdir}/sfcb" >> _pkg_list
@@ -89,6 +89,6 @@
 exit 0
 
 %files schema
-%{_datadir}/%{name}/CIM
+%{_datadir}/sfcb/CIM
 
 %files -f _pkg_list

Index: Makefile.am
===================================================================
RCS file: /cvsroot/sblim/sfcb/Makefile.am,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- Makefile.am	27 Apr 2005 17:09:56 -0000	1.17
+++ Makefile.am	27 Apr 2005 17:48:29 -0000	1.18
@@ -20,9 +20,10 @@
 # 
 # 
 
+sfcbdatadir=$(datadir)/sfcb
 sfcbconfdir=$(sysconfdir)/sfcb
 sfcbstatedir=$(localstatedir)/lib/sfcb
-sfcbdocdir=$(datadir)/doc/$(PACKAGE)-$(VERSION)
+sfcbdocdir=$(datadir)/doc/sfcb-$(VERSION)
 initdir=$(sysconfdir)/init.d
 
 BUILT_SOURCES=queryParser.c queryLexer.c authorizationParser.c \
@@ -163,9 +164,9 @@
 
 sfcbconf_DATA=sfcb.cfg
 
-dist_pkgdata_SCRIPTS=genSslCert.sh getSchema.sh
+dist_sfcbdata_SCRIPTS=genSslCert.sh getSchema.sh
 
-dist_pkgdata_DATA=default.reg
+dist_sfcbdata_DATA=default.reg
 
 nodist_bin_SCRIPTS=sfcbrepos sfcbstage sfcbunstage 
 
@@ -220,15 +221,15 @@
 	-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 \
 		sfcb.init-redhat sfcb.init-suse sfcb.init-none
 
 dist-hook:
 	test -d "$(distdir)" &&	rm -rf `find $(distdir) -type d -name CVS`
 
 install-cimschema: getSchema.sh
-	test -d $(DESTDIR)$(pkgdatadir) || $(mkdir_p) $(DESTDIR)$(pkgdatadir)
-	sh getSchema.sh -f $(DESTDIR)$(pkgdatadir)
+	test -d $(DESTDIR)$(sfcbdatadir) || $(mkdir_p) $(DESTDIR)$(sfcbdatadir)
+	sh getSchema.sh -f $(DESTDIR)$(sfcbdatadir)
 
 postinstall: install-cimschema
 	test -f $(DESTDIR)$(sfcbstatedir)/registration/providerRegister || $(INSTALL_DATA) $(DESTDIR)$(sfcbstatedir)/stage/default.reg $(DESTDIR)$(sfcbstatedir)/registration/providerRegister 

Index: sfcbrepos.sh.in
===================================================================
RCS file: /cvsroot/sblim/sfcb/sfcbrepos.sh.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- sfcbrepos.sh.in	27 Apr 2005 11:53:13 -0000	1.7
+++ sfcbrepos.sh.in	27 Apr 2005 17:48:29 -0000	1.8
@@ -42,7 +42,7 @@
     echo -e "\t-f force repository creation"
     echo -e "\t-s specify staging directory [@localstatedir@/lib/sfcb/stage]"
     echo -e "\t-r specify repository directory [@localstatedir@/lib/sfcb/registration]"
-    echo -e "\t-c specify directory containing CIM Schema MOFs [@datadir@/@PACKAGE@/CIM]"
+    echo -e "\t-c specify directory containing CIM Schema MOFs [@datadir@/sfcb/CIM]"
     echo
     echo "Use to create sfcb provider registration and class repository."
     exit 0
@@ -75,7 +75,7 @@
 
 if [ -z "$cimschemadir" ]
 then
-    cimschemadir=@datadir@/@PACKAGE@/CIM
+    cimschemadir=@datadir@/sfcb/CIM
 fi
 
 if [ -d $stagingdir ] && [ -f $stagingdir/default.reg ] &&