[Pkg-gridengine-commits] [pkg-gridengine] 13/16: Use the arch script to determine folder name rather than hardcode lx-*

[Afif Elghraoui]

This is an automated email from the git hooks/post-receive script.

afif pushed a commit to branch master
in repository pkg-gridengine.

commit 6748688a8c36ec4bda56c99f624fbfd21e55c22f
Author: Afif Elghraoui <afif at debian.org>
Date:   Sat Jul 9 17:51:20 2016 -0700

    Use the arch script to determine folder name rather than hardcode lx-*
    
    The hardcoding will be broken on non-linux builds anyway.
---
 debian/rules | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index bd37552..af11a37 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,6 +29,7 @@ export SGE_INPUT_CFLAGS = $(CPPFLAGS) $(CFLAGS)
 export SGE_INPUT_LDFLAGS = $(LDFLAGS)
 
 export LD_RUN_PATH=/usr/lib/gridengine
+SGE_ARCH = $(shell source/dist/util/arch)
 
 %:
 	dh $@ --parallel --with autoreconf,autotools-dev
@@ -84,10 +85,10 @@ override_dh_auto_install:
 	&& $(RM) -r util/gui-installer \
 	&& mv util/resources/drmaa4ruby .
 # qmake clashes with qt
-	cd debian/tmp/usr/bin/lx-* && mv qmake qmake_sge
+	cd debian/tmp/usr/bin/$(SGE_ARCH) && mv qmake qmake_sge
 # Rename some of the spool utils so we can replace them with wrapper scripts
 # which set LD_LIBRARY_PATH for the spool libraries
-	cd debian/tmp/usr/utilbin/lx* \
+	cd debian/tmp/usr/utilbin/$(SGE_ARCH) \
 	&& mv spooledit spooledit.bin \
 	&& mv spooldefaults spooldefaults.bin \
 	&& install -m 755 $(CURDIR)/debian/spool.wrapper spooledit \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gridengine/pkg-gridengine.git