[med-svn] [vista] 01/01: Fixed use of gtm_dist environment variable.

[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 743d12387d99275c9d8f47463daf13a38d34e686
Author: Luis Ibanez <luis.ibanez at kitware.com>
Date:   Sat Jan 11 20:52:18 2014 -0500

    Fixed use of gtm_dist environment variable.
    
    Fixed use of environment variables in rules for gtm_dist and call to GDE and mupip.
---
 debian/changelog | 1 +
 debian/rules     | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 48ee055..3d9ee84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,5 +8,6 @@ vista-foia (0.20140106-1) UNRELEASED; urgency=low
   * 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.
+  * Fixed use of environment variables in rules for gtm_dist and call to GDE and mupip.
 
  -- Luis Ibanez <luis.ibanez at kitware.com>  Wed, 4 Jul 2012 17:16:45 -0500
diff --git a/debian/rules b/debian/rules
index d64ab32..3952003 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ VISTA_GLOBALS_DIR=$(VISTAINSTANCEDIR)/g
 VISTA_ROUTINES_DIR=$(VISTAINSTANCEDIR)/r
 VISTA_OBJECTS_DIR=$(VISTAINSTANCEDIR)/o
 VISTA_GTM_DATABASE=$(VISTAINSTANCEDIR)/g/database
-VISTA_GTM_ROUTINES="$(VISTAINSTANCEDIR)/o\($(VISTAINSTANCEDIR)/r\) $(GTM_INSTALL_DIR)/libgtmutil.so"
+VISTA_GTM_ROUTINES="$(VISTAINSTANCEDIR)/o($(VISTAINSTANCEDIR)/r) $(GTM_INSTALL_DIR)/libgtmutil.so"
 
 %:
 	dh $@
@@ -30,9 +30,9 @@ override_dh_auto_install:
 	mkdir -p $(VISTA_GLOBALS_DIR)
 	mkdir -p $(VISTAINSTANCEDIR)/inet
 	mkdir -p $(VISTAINSTANCEDIR)/inet/Logs
-	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
+	(export gtmgbldir=$(VISTA_GTM_DATABASE); export gtmroutines=$(VISTA_GTM_ROUTINES); export gtm_dist=$(GTM_INSTALL_DIR); echo "change -s DEFAULT -f=$(VISTAINSTANCEDIR)/g/database" | $(GTM_INSTALL_DIR)/mumps -r GDE)
+	(export gtmgbldir=$(VISTA_GTM_DATABASE); export gtmroutines=$(VISTA_GTM_ROUTINES); export gtm_dist=$(GTM_INSTALL_DIR); $(GTM_INSTALL_DIR)/mupip create)
+	(export gtmgbldir=$(VISTA_GTM_DATABASE); export gtmroutines=$(VISTA_GTM_ROUTINES); export 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