[med-svn] [vista] 01/01: Making progress on database configuration.

[Luis Ibanez]

This is an automated email from the git hooks/post-receive script.

luisibanez-guest pushed a commit to branch master
in repository vista.

commit c0b02f1fae4c4de1035f26fa9db278d7d966ae81
Author: Luis Ibanez <luis.ibanez at kitware.com>
Date:   Mon Jan 6 21:56:54 2014 -0500

    Making progress on database configuration.
    
    Still need to figure out how to set up environment variables, such
    as gtm_dist and gtmroutines.
---
 debian/changelog |  1 +
 debian/rules     | 22 +++++++++-------------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3caaa8f..48ee055 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,5 +7,6 @@ vista-foia (0.20140106-1) UNRELEASED; urgency=low
   * Updated to VistA helper package to the most recent version: 20140106.
   * Added "describe-current-version" target to debian/rules.
   * Fixed name of tar.gz file and git hash in get-orig-source for VistA repository.
+  * Making progress on database configuration in rules file.
 
  -- Luis Ibanez <luis.ibanez at kitware.com>  Wed, 4 Jul 2012 17:16:45 -0500
diff --git a/debian/rules b/debian/rules
index a57074b..d64ab32 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,9 @@ VISTAINSTANCEDIR=debian/usr/share/vista-foia
 GTM_INSTALL_DIR=/usr/lib/fis-gtm/V6.0-003_x86_64
 VISTA_GLOBALS_DIR=$(VISTAINSTANCEDIR)/g
 VISTA_ROUTINES_DIR=$(VISTAINSTANCEDIR)/r
-GTMPROFILE=$(GTM_INSTALL_DIR)/gtmprofile
+VISTA_OBJECTS_DIR=$(VISTAINSTANCEDIR)/o
+VISTA_GTM_DATABASE=$(VISTAINSTANCEDIR)/g/database
+VISTA_GTM_ROUTINES="$(VISTAINSTANCEDIR)/o\($(VISTAINSTANCEDIR)/r\) $(GTM_INSTALL_DIR)/libgtmutil.so"
 
 %:
 	dh $@
@@ -18,25 +20,19 @@ override_dh_auto_configure:
 	dh_auto_configure -- \
 -DCMAKE_INSTALL_PREFIX:PATH=/usr \
 -DGTM_INSTALL_DIR=$(GTM_INSTALL_DIR) \
--DGTMPROFILE:PATH=$(GTMPROFILE) \
 -DVISTA_GLOBALS_DIR:PATH=$(VISTA_GLOBALS_DIR) \
 -DVISTA_ROUTINE_DIR:PATH=$(VISTA_ROUTINES_DIR)
 
 override_dh_auto_install:
 	mkdir -p $(VISTAINSTANCEDIR)
-	mkdir -p $(VISTAINSTANCEDIR)/r
-	mkdir -p $(VISTAINSTANCEDIR)/o
-	mkdir -p $(VISTAINSTANCEDIR)/g
+	mkdir -p $(VISTA_ROUTINES_DIR)
+	mkdir -p $(VISTA_OBJECTS_DIR)
+	mkdir -p $(VISTA_GLOBALS_DIR)
 	mkdir -p $(VISTAINSTANCEDIR)/inet
 	mkdir -p $(VISTAINSTANCEDIR)/inet/Logs
-	gtm_dist=$(GTM_INSTALL_DIR)
-	gtmprofilefile=$(gtm_dist)/gtmprofile
-	source $(gtmprofilefile)
-	gtmgbldir=$(VISTAINSTANCEDIR)/g/database
-	gtmroutines="$(VISTAINSTANCEDIR)/o($(VISTAINSTANCEDIR)/r) $(gtm_dist)/libgtmutil.so"
-	echo "change -s DEFAULT -f=$(VISTAINSTANCEDIR)/g/database" | $(gtm_dist)/mumps -r GDE
-	$(gtm_dist)/mupip create
-	$(gtm_dist)/dse change -f -key_max=1023 -rec=4096
+	gtmgbldir=$(VISTA_GTM_DATABASE) && gtmroutines="$(VISTA_GTM_ROUTINES)" && gtm_dist=$(GTM_INSTALL_DIR) && echo "change -s DEFAULT -f=$(VISTAINSTANCEDIR)/g/database" | $(GTM_INSTALL_DIR)/mumps -r GDE
+	gtmgbldir=$(VISTA_GTM_DATABASE) && gtmroutines="$(VISTA_GTM_ROUTINES)" && gtm_dist=$(GTM_INSTALL_DIR) && $(GTM_INSTALL_DIR)/mupip create
+	gtmgbldir=$(VISTA_GTM_DATABASE) && gtmroutines="$(VISTA_GTM_ROUTINES)" && gtm_dist=$(GTM_INSTALL_DIR) && $(GTM_INSTALL_DIR)/dse change -f -key_max=1023 -rec=4096
 
 
 get-orig-source:

-- 
Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/vista.git