[med-svn] [vista] 01/01: Added installation 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 b11f55e6a26fe71819d82786da8883ecabe68f9f
Author: Luis Ibanez <luis.ibanez at kitware.com>
Date:   Mon Jan 27 21:33:57 2014 -0500

    Added installation rule.
    
    Targeting the place where debuild expect to find the final installation.
    We are moving the Vista instance to that expected location.
---
 debian/changelog | 1 +
 debian/rules     | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 99660b9..06539af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,5 +31,6 @@ vista-foia (0.20140106-1) UNRELEASED; urgency=low
   * In rules, reorganized build vs config. Leaving compilation only in build.
   * In rules, refining auto_install rule.
   * In rules, remove code to compile .m files. Now moved to CMake itself.
+  * In rules, added final installation rule. Targeting debuild expected dir.
 
  -- Luis Ibanez <luis.ibanez at kitware.com>  Wed, 4 Jul 2012 17:16:45 -0500
diff --git a/debian/rules b/debian/rules
index 7e6e088..f994e28 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,8 @@ 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)
-VISTA_INSTALL_DIR=usr/share/vista-foia/$(VISTA_FOIA_VERSION)
+DESTINATION_DIR=usr/share/vista-foia
+VISTA_INSTALL_DIR=$(DESTINATION_DIR)/$(VISTA_FOIA_VERSION)
 VISTAINSTANCEDIR=$(LOCALINSTANCEDIR)/$(VISTA_INSTALL_DIR)
 GTM_INSTALL_DIR=/usr/lib/fis-gtm/$(UAPIDIR)
 VISTA_GLOBALS_DIR=$(VISTAINSTANCEDIR)/g
@@ -27,7 +28,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 $@
@@ -74,7 +75,9 @@ cd $(VISTA_TESTING_BINARY_DIR) && make)
 
 
 override_dh_auto_install:
-	dh_auto_install --destdir=debian/$(BINPKG) $@
+	mkdir -p debian/$(BINPKG)/$(DESTINATION_DIR)
+	cp -r  $(LOCALINSTANCEDIR)/$(VISTA_INSTALL_DIR) debian/$(BINPKG)/$(DESTINATION_DIR)
+
 
 get-orig-source:
 	wget -O../OSEHRA-VistA-M-897bff2a.orig.tar.gz https://github.com/OSEHRA/VistA-M/tarball/897bff2a

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