From 43c3f1497926407bae8730a7eef4b68feebc239f Mon Sep 17 00:00:00 2001 From: Christian Rößler Date: Tue, 10 Sep 2013 17:01:05 +0200 Subject: [system.inc] now self-detects SYS_DISTRIBUTION as not being reliably sourced. --- helper/system.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'helper') diff --git a/helper/system.inc b/helper/system.inc index bbab4a40..606ef406 100644 --- a/helper/system.inc +++ b/helper/system.inc @@ -22,10 +22,11 @@ export MAKEFLAGS="-j$CPU_CORES" # Determine if we have lib64 if [ "$(uname -m)x" = "x86_64x" ]; then # Setting LIB64, as openSuse differentiates but Ubuntu does not: + SYS_DISTRIBUTION=$(lsb_release -is | tr '[A-Z]' '[a-z]' | sed -r 's/[^a-z0-9]//g;s/project$//g;s/scientificsl$/scientific/g') case $SYS_DISTRIBUTION in ubuntu | debian) LIB64="lib" ;; opensuse) LIB64="lib64" ;; - *) perror "Cannot set LIB64, SYS_DISTRIBUTION: $SYS_DISTRIBUTION unknown / not set!" ;; + *) pwarning "Cannot set LIB64, SYS_DISTRIBUTION: $SYS_DISTRIBUTION unknown!" ;; esac AMD64_I386=amd64 X86_64_I586=x86_64 -- cgit v1.2.3-55-g7522