This is an automated email from the git hooks/post-receive script. luisibanez-guest pushed a commit to branch master in repository vista.
commit b9f917e3ce06d94ce234dde2e0c8b2699596ac05 Author: Luis Ibanez <[email protected]> Date: Tue Jan 14 21:17:04 2014 -0500 Start managing arch. Depending on the architecture, fis-gtm will have a different name in its installation directory. In this change, we start to manage better that location according to the architecture. Still is mostly set for the x64 case. Adjustments are required to fully consider the x86 case. --- debian/changelog | 1 + debian/rules | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e051355..0275e05 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,5 +18,6 @@ vista-foia (0.20140106-1) UNRELEASED; urgency=low * Fixed package name in debian/control Provides: field. Lintian warning. * Configured CMake to build the binary testing directory. * In rules separating install, configure and build. + * In rule started to add management of arch. Mostly x64 so far. -- Luis Ibanez <[email protected]> Wed, 4 Jul 2012 17:16:45 -0500 diff --git a/debian/rules b/debian/rules index 623b623..63765db 100755 --- a/debian/rules +++ b/debian/rules @@ -5,13 +5,19 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +ARCH=$(shell dpkg-architecture -qDEB_HOST_GNU_CPU) +UAPIVER=6.0-003 +UAPIDIR=V$(UAPIVER)_$(ARCH) VISTAINSTANCEDIR=$(PWD)/debian/usr/share/vista-foia -GTM_INSTALL_DIR=/usr/lib/fis-gtm/V6.0-003_x86_64 +GTM_INSTALL_DIR=/usr/lib/fis-gtm/$(UAPIDIR) VISTA_GLOBALS_DIR=$(VISTAINSTANCEDIR)/g VISTA_ROUTINES_DIR=$(VISTAINSTANCEDIR)/r VISTA_OBJECTS_DIR=$(VISTAINSTANCEDIR)/o VISTA_GTM_DATABASE=$(VISTAINSTANCEDIR)/g/database -VISTA_GTM_ROUTINES="$(VISTA_OBJECTS_DIR)($(VISTA_ROUTINES_DIR)) $(GTM_INSTALL_DIR)/libgtmutil.so" +# The libgtmutil.so file only exist in the x64 architecture. +# We need to add here the x86 alternative. +VISTA_GTM_ROUTINES_ARCH=$(GTM_INSTALL_DIR)/libgtmutil.so +VISTA_GTM_ROUTINES="$(VISTA_OBJECTS_DIR)($(VISTA_ROUTINES_DIR)) $(VISTA_GTM_ROUTINES_ARCH)" VISTA_M_WORKING_TREE=$(PWD)/OSEHRA-VistA-M-897bff2 VISTA_TESTING_BINARY_DIR=$(PWD)/debian/build VISTA_TESTING_SOURCE_DIR=$(PWD) -- Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/vista.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
