From b36f594450a401300d9f83ea365009cd146ae24f Mon Sep 17 00:00:00 2001 From: Joe Hunkeler Date: Sun, 4 Oct 2015 14:09:21 -0400 Subject: Fix compatibility issues --- ds9/ds9.ini | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) (limited to 'ds9') diff --git a/ds9/ds9.ini b/ds9/ds9.ini index 449aa04..be6b0e4 100644 --- a/ds9/ds9.ini +++ b/ds9/ds9.ini @@ -29,14 +29,28 @@ commands : [cbc_build] linux : - ln -s make.darwinmavericks make.include - sed -i -e '/^ZZ/ s/$$/ -arch x86_64/' \ - -e '/^AA/ s/$$/ -arch x86_64/' make.include - - sed -i -e '/CODESIGN =/c \ - CODESIGN = echo' make.include - - make LDFLAGS='-arch x86_64 -m64' + case "$$(uname)" in + Linux) + LDFLAGS='-m64' + ln -s make.linux64 make.include + ;; + Darwin) + LDFLAGS='-arch x86_64 -m64' + cp -a make.darwinmavericks make.include + + sed -i -e '/^ZZ/ s/$$/ -arch x86_64/' \ + -e '/^AA/ s/$$/ -arch x86_64/' make.include + sed -i -e '/CODESIGN =/c \ + CODESIGN = echo' make.include + ;; + *) + echo "Unsupported" + exit 1 + ;; + esac + + + make mkdir -p $$PREFIX/bin cp -a bin/ds9* bin/x* $$PREFIX/bin windows : -- cgit