[med-svn] r11613 - trunk/packages/vista/trunk/debian

[Luis Ibanez]

Author: luisibanez-guest
Date: 2012-07-07 00:58:12 +0000 (Sat, 07 Jul 2012)
New Revision: 11613

Modified:
   trunk/packages/vista/trunk/debian/changelog
   trunk/packages/vista/trunk/debian/rules
Log:
ENH: Reorganized dh_auto_install section.


Modified: trunk/packages/vista/trunk/debian/changelog
===================================================================
--- trunk/packages/vista/trunk/debian/changelog	2012-07-07 00:44:49 UTC (rev 11612)
+++ trunk/packages/vista/trunk/debian/changelog	2012-07-07 00:58:12 UTC (rev 11613)
@@ -8,5 +8,6 @@
     recombine them into a single vista tar file.
     Moving vista installation from /usr/share to /var/lib.
     Simplified get-orig-source. Renamed tar file as vista_1.0.tar.gz
+    Reorganized the dh_auto_install section.
 
  -- Luis Ibanez <luis.ibanez at kitware.com>  Wed, 4 Jul 2012 17:16:45 -0500

Modified: trunk/packages/vista/trunk/debian/rules
===================================================================
--- trunk/packages/vista/trunk/debian/rules	2012-07-07 00:44:49 UTC (rev 11612)
+++ trunk/packages/vista/trunk/debian/rules	2012-07-07 00:58:12 UTC (rev 11613)
@@ -29,16 +29,15 @@
 	mkdir -p $(VISTAINSTANCEDIR)/g
 	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
+	export gtm_dist=$(GTM_INSTALL_DIR)
+	@source $(GTMPROFILE)
+	export gtmgbldir=$(VISTAINSTANCEDIR)/g/database
+	export gtmroutines="$(VISTAINSTANCEDIR)/o($(VISTAINSTANCEDIR)/r) $(GTM_INSTALL_DIR)/libgtmutil.so"
+	export gtm_tmp=/tmp
+	echo "change -s DEFAULT -f=$(VISTAINSTANCEDIR)/g/database" | $(GTM_INSTALL_DIR)/mumps -r GDE
+	$(GTM_INSTALL_DIR)/mupip create
+	$(GTM_INSTALL_DIR)/dse change -f -key_max=1023 -rec=4096
 
-
 get-orig-source:
 	wget -O./OSEHRA-VistA-FOIA.orig.tar.gz https://github.com/OSEHRA/VistA-FOIA/tarball/master
 	wget -O./OSEHRA-OSEHRA-Automated-Testing.orig.tar.gz https://github.com/OSEHRA/OSEHRA-Automated-Testing/tarball/master