- Integrate scstadmin's Makefile with enable_proc and

disable_proc so the correct scstadmin version is
  installed.



git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1860 d57e44dd-8a1f-0410-8b47-8ef2f437770f

scstadmin/Makefile

@@ -1,38 +1,42 @@
-MODULE_VERSION = 0.8.22
-TOOL = scstadmin
+SCSTADMIN_DIR = scstadmin
 
-SBINDIR := $(PREFIX)/usr/local/sbin
 INITDIR := $(PREFIX)/etc/init.d
 
-all: perl-module
+all:
+	cd $(SCSTADMIN_DIR) && $(MAKE) $@
 
 install:
-	$(MAKE) -C scst-$(MODULE_VERSION) install
-	install -m 755 $(TOOL) $(DESTDIR)$(SBINDIR)
-	install -m 755 init.d/scst $(DESTDIR)$(INITDIR)
-	install -m 755 init.d/qla2x00t $(DESTDIR)$(INITDIR)
+	cd $(SCSTADMIN_DIR) && $(MAKE) $@
 	-/usr/lib/lsb/install_initd scst
 	-/usr/lib/lsb/install_initd qla2x00t
+	install -m 755 init.d/scst $(DESTDIR)$(INITDIR)
+	install -m 755 init.d/qla2x00t $(DESTDIR)$(INITDIR)
 
 uninstall:
 	-/usr/lib/lsb/remove_initd qla2x00t
 	-/usr/lib/lsb/remove_initd scst
 	-rm -f $(DESTDIR)$(PATH_INITD)/qla2x00t
 	-rm -f $(DESTDIR)$(PATH_INITD)/scst
-	-rm -f $(DESTDIR)$(PATH_SBIN)/$(TOOL)
-	$(MAKE) -C scst-$(MODULE_VERSION) uninstall
+	cd $(SCSTADMIN_DIR) && $(MAKE) $@
 
 perl-module:
-	@cd ./scst-$(MODULE_VERSION); \
-	perl Makefile.PL;
-	$(MAKE) -C scst-$(MODULE_VERSION)
+	cd $(SCSTADMIN_DIR) && $(MAKE) $@
 
 clean:
-	-$(MAKE) -C scst-$(MODULE_VERSION) clean
+	cd $(SCSTADMIN_DIR) && $(MAKE) $@
 
-distclean: clean
-	-rm -f scst-$(MODULE_VERSION)/Makefile.old
+distclean:
+	cd $(SCSTADMIN_DIR) && $(MAKE) $@
 
-extraclean: distclean
+extraclean:
+	cd $(SCSTADMIN_DIR) && $(MAKE) $@
 
-.PHONY: all install uninstall perl-module clean distclean extraclean
+disable_proc:
+	-rm scstadmin
+	ln -s sysfs scstadmin
+
+enable_proc:
+	-rm scstadmin
+	ln -s procfs scstadmin
+
+.PHONY: all install uninstall perl-module clean distclean extraclean disable_proc enable_proc

scstadmin/README

@@ -7,6 +7,10 @@ The perl module SCST::SCST is very generic and tries to handle error checking as
 
 The init script was written for debian but should work on most distributions.
 
+
+	sysfs		Use this version if you've disabled procfs support in SCST.
+	procfs		This is the default version which uses the older procfs.
+
 	scst-0.8.22	This is the SCST Perl module required by scstadmin and scst_db.
 	scst-0.9.00	This is the SCST Perl module to be used with SCST compiled
                         for sysfs. Note, the current version of scstadmin will NOT yet
@@ -16,9 +20,6 @@ The init script was written for debian but should work on most distributions.
 			a configuration file. See scst.conf. For command help,
 				#> scstadmin
 
-        scstadmin.sysfs This is the sysfs version of scstadmin, a complete rewrite. This
-                        is VERY incomplete at this point so don't expect results.
-
 	old		Script which configures SCST using configurations
 			found in a database. See the examples directory database
 			schema and example data. You will need to edit the
@@ -48,10 +49,22 @@ NOTE: The init.d startup & shutdown scripts now depend on lsb-core. Ensure you h
 lsb-core installed or 'make install' will fail. Make sure /usr/lib/lsb/install_initd
 exists.
 
+To enable the newer sysfs version:
+
+  #> make disable_proc
+  #> make
+  #> make install
+
 
 Getting Started:
 ================
 
+The following pertains to the older procfs based SCST. The new sysfs version is still
+a work in progress, but should be mostly complete at this point. You may still use your
+old scst.conf, however, I very much recommend you perform a -write_config and review
+the resulting configuration file.
+
+
 The scstadmin script is much more functional than scst_db at this point but uses a
 standard text-based config file. The original thought behind scst_db was to write
 a daemon process which would except network connections and issue SCST commands. A

scstadmin/procfs/Makefile

@@ -0,0 +1,29 @@
+MODULE_VERSION = 0.8.22
+TOOL = scstadmin
+
+SBINDIR := $(PREFIX)/usr/local/sbin
+
+all: perl-module
+
+install:
+	$(MAKE) -C scst-$(MODULE_VERSION) install
+	install -m 755 $(TOOL) $(DESTDIR)$(SBINDIR)
+
+uninstall:
+	-rm -f $(DESTDIR)$(PATH_SBIN)/$(TOOL)
+	$(MAKE) -C scst-$(MODULE_VERSION) uninstall
+
+perl-module:
+	@cd ./scst-$(MODULE_VERSION); \
+	perl Makefile.PL;
+	$(MAKE) -C scst-$(MODULE_VERSION)
+
+clean:
+	-$(MAKE) -C scst-$(MODULE_VERSION) clean
+
+distclean: clean
+	-rm -f scst-$(MODULE_VERSION)/Makefile.old
+
+extraclean: distclean
+
+.PHONY: all install uninstall perl-module clean distclean extraclean

scstadmin/scstadmin

@@ -0,0 +1 @@
+procfs

scstadmin/sysfs/Makefile

@@ -0,0 +1,29 @@
+MODULE_VERSION = 0.9.00
+TOOL = scstadmin
+
+SBINDIR := $(PREFIX)/usr/local/sbin
+
+all: perl-module
+
+install:
+	$(MAKE) -C scst-$(MODULE_VERSION) install
+	install -m 755 $(TOOL) $(DESTDIR)$(SBINDIR)
+
+uninstall:
+	-rm -f $(DESTDIR)$(PATH_SBIN)/$(TOOL)
+	$(MAKE) -C scst-$(MODULE_VERSION) uninstall
+
+perl-module:
+	@cd ./scst-$(MODULE_VERSION); \
+	perl Makefile.PL;
+	$(MAKE) -C scst-$(MODULE_VERSION)
+
+clean:
+	-$(MAKE) -C scst-$(MODULE_VERSION) clean
+
+distclean: clean
+	-rm -f scst-$(MODULE_VERSION)/Makefile.old
+
+extraclean: distclean
+
+.PHONY: all install uninstall perl-module clean distclean extraclean