[med-svn] [vista] 03/03: Refining the auto_install rule.

[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 ecd54a49165ba487bbe098c79e61b7e50f707b11
Author: Luis Ibanez <luis.ibanez at kitware.com>
Date:   Sat Jan 25 18:43:15 2014 -0500

    Refining the auto_install rule.
---
 debian/changelog |  2 ++
 debian/rules     | 11 +++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 338b75e..458ffe1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,5 +29,7 @@ vista-foia (0.20140106-1) UNRELEASED; urgency=low
   * In rules, better chain targets for import and then compilation.
   * In control, set Vcs-Browser and Vcs-Git to point to git repo in Alioth.
   * In rules, reorganized build vs config. Leaving compilation only in build.
+  * In rules, refining auto_install rule.
+
 
  -- Luis Ibanez <luis.ibanez at kitware.com>  Wed, 4 Jul 2012 17:16:45 -0500
diff --git a/debian/rules b/debian/rules
index 281118b..0efe536 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,10 +8,12 @@
 ARCH=$(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
 UAPIVER=6.0-003
 UAPIDIR=V$(UAPIVER)_$(ARCH)
+BINPKG := $(shell awk '/Package:.*[0-9]/{print $$2;}' debian/control)
 LOCALINSTANCEDIR=$(CURDIR)/debian
 VISTA_FOIA_DATE=20130405
 VISTA_FOIA_VERSION=V-0.$(VISTA_FOIA_DATE)
-VISTAINSTANCEDIR=$(LOCALINSTANCEDIR)/usr/share/vista-foia/$(VISTA_FOIA_VERSION)
+VISTA_INSTALL_DIR=usr/share/vista-foia/$(VISTA_FOIA_VERSION)
+VISTAINSTANCEDIR=$(LOCALINSTANCEDIR)/$(VISTA_INSTALL_DIR)
 GTM_INSTALL_DIR=/usr/lib/fis-gtm/$(UAPIDIR)
 VISTA_GLOBALS_DIR=$(VISTAINSTANCEDIR)/g
 VISTA_ROUTINES_DIR=$(VISTAINSTANCEDIR)/r
@@ -25,6 +27,7 @@ VISTA_M_WORKING_TREE=$(CURDIR)/OSEHRA-VistA-M-897bff2
 VISTA_TESTING_BINARY_DIR=$(CURDIR)/debian/build
 VISTA_TESTING_SOURCE_DIR=$(CURDIR)
 VISTA_TESTING_LOG_DIR=$(VISTA_TESTING_BINARY_DIR)/Temporary/Log
+LOCAL_VISTA_INSTALL_DIR := $(CURDIR)/debian/$(BINPKG)/$(VISTA_INSTALL_DIR)
 
 %:
 	dh $@
@@ -94,9 +97,6 @@ cmake $(VISTA_TESTING_SOURCE_DIR)   \
 )
 
 
-override_dh_auto_install:
-
-
 override_dh_auto_build:
 	(export gtmgbldir=$(VISTA_GTM_DATABASE); export gtmroutines=$(VISTA_GTM_ROUTINES); export gtm_dist=$(GTM_INSTALL_DIR); \
 export gtm_destdir=$(LOCALINSTANCEDIR); \
@@ -106,6 +106,9 @@ make ExperimentalConfigure; \
 make ExperimentalBuild)
 
 
+override_dh_auto_install:
+	dh_auto_install --destdir=debian/$(BINPKG) $@
+
 get-orig-source:
 	wget -O../OSEHRA-VistA-M-897bff2a.orig.tar.gz https://github.com/OSEHRA/VistA-M/tarball/897bff2a
 	wget -O../vista-foia_0.20140106.orig.tar.gz   https://github.com/OSEHRA/VistA/tarball/fdc8ff2b

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