Index: /branches/eam_branches/ipp-pstamp-20260421/DataStoreServer/example/commands.sh
===================================================================
--- /branches/eam_branches/ipp-pstamp-20260421/DataStoreServer/example/commands.sh	(revision 42993)
+++ /branches/eam_branches/ipp-pstamp-20260421/DataStoreServer/example/commands.sh	(revision 42993)
@@ -0,0 +1,2 @@
+dsprodtool --add mytest2 --type sample --description quick
+dsreg --add myfs --product mytest --type dump --list fs_example.txt --datapath . --copy
Index: /branches/eam_branches/ipp-pstamp-20260421/DataStoreServer/notes.txt
===================================================================
--- /branches/eam_branches/ipp-pstamp-20260421/DataStoreServer/notes.txt	(revision 42992)
+++ /branches/eam_branches/ipp-pstamp-20260421/DataStoreServer/notes.txt	(revision 42993)
@@ -15,7 +15,15 @@
   This generates the tables needed by the datastore web pages and tools
 
+* choose a psbuild location:
+  # psconfig ipp-pstamp
+  * sets the build / install environment for code below which does not go into
+    the apache server cgi location
+
+* in psconfig, to install needed perl libraries:
+  # pscheckperl pstamp-ubuntu -build
+
 * in DataStoreServer, to install the apache CGI elements:
-  * ./autogen.sh --with-cgidir=/MY/DATASTORE/ds-cgi --with-dsroot=/MY/DATASTORE/dsroot
-  * make cgi
+  # ./autogen.sh --with-cgidir=/MY/DATASTORE/ds-cgi --with-dsroot=/MY/DATASTORE/dsroot
+  # make cgi
   * then edit /MY/DATASTORE/ds-cgi/dsshellconfig
     ** supply the perl path of the user built to support the datastore
@@ -45,12 +53,18 @@
 
 * Things needed in the user build by the apache server:
-  * dsdbh.pm in PERL
+  * dsdbh.pm (installed as part of DataStoreServer : make cgi)
+  * Devel::CheckLib
   * DBD/mysql.pm
+
+* Edit the ippconfig/site.config to point at the datastore:
+  * DS_DBSERVER     
+  * DS_DBNAME       
+  * DS_DBUSER       
+  * DS_DBPASSWORD   
+  * DATA_STORE_ROOT
 
 * Things installed as user tools:
   * dsreg
   * dsprodtool
-
-*
 
 ----------
Index: /branches/eam_branches/ipp-pstamp-20260421/DataStoreServer/web/cgi/Makefile.am
===================================================================
--- /branches/eam_branches/ipp-pstamp-20260421/DataStoreServer/web/cgi/Makefile.am	(revision 42992)
+++ /branches/eam_branches/ipp-pstamp-20260421/DataStoreServer/web/cgi/Makefile.am	(revision 42993)
@@ -1,2 +1,13 @@
+
+installdir = $(libdir)
+
+install_files = dsdbh.pm
+
+install_SCRIPTS = $(install_files)
+
+ACLOCAL_AMFLAGS = -I m4
+
+cgi_config = dsshellconfig
+
 cgi_scripts = \
   dsindex.cgi \
@@ -5,10 +16,9 @@
   dsfsindex \
   dsprodindex \
-  dsrootindex \
-  dsshellconfig
+  dsrootindex
 
 dsroot_files = index.txt.template index.txt
 
-EXTRA_DIST = $(cgi_scripts) $(dsroot_files)
+EXTRA_DIST = $(cgi_scripts) $(cgi_config) $(dsroot_files)
 
 install-cgi:
@@ -29,9 +39,19 @@
 	  $(INSTALL_DATA) $$f $(DESTDIR)$(dsroot)/$$f; \
 	done
-	@echo ""
-	@echo "datastore apache CGI code installation complete."
-	@echo "Now please edit $(DESTDIR)$(cgidir)/dsshellconfig"
-	@echo "and add the required settings."
-	@echo ""
+
+	@if test ! -f "$(DESTDIR)$(cgidir)/dsshellconfig"; then \
+	  $(INSTALL_DATA) dsshellconfig "$(DESTDIR)$(cgidir)/dsshellconfig"; \
+	  echo ""; \
+	  echo "Installed new dsshellconfig file:"; \
+	  echo "  $(DESTDIR)$(cgidir)/dsshellconfig"; \
+	  echo "Please edit it and add the required settings."; \
+	  echo ""; \
+	else \
+	  echo ""; \
+	  echo "Preserving existing file:"; \
+	  echo "  $(DESTDIR)$(DESTDIR)$(cgidir)/dsshellconfig"; \
+	  echo "Template not reinstalled, so local edits were kept."; \
+	  echo ""; \
+	fi
 
 uninstall-cgi: