diff options
| author | Christian Rößler | 2013-09-10 17:01:05 +0200 |
|---|---|---|
| committer | Christian Rößler | 2013-09-10 17:01:05 +0200 |
| commit | d5e71ad32173408ce0247e00bb82c4cad8105d55 (patch) | |
| tree | 9b88208925dd7ad69cefabdd9cad76d643bb10b9 | |
| parent | Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts (diff) | |
| download | tm-scripts-d5e71ad32173408ce0247e00bb82c4cad8105d55.tar.gz tm-scripts-d5e71ad32173408ce0247e00bb82c4cad8105d55.tar.xz tm-scripts-d5e71ad32173408ce0247e00bb82c4cad8105d55.zip | |
[system.inc] now self-detects SYS_DISTRIBUTION as not being reliably sourced.
| -rw-r--r-- | helper/system.inc | 3 |
1 files changed, 2 insertions, 1 deletions
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 |