From 2138e71da77b2e41fa3913748c22316553928acf Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Thu, 12 Apr 2007 11:06:22 +0200 Subject: [PATCH] Forgot to adjust $CC in grml-terminalserver-config for new gcc version. Fixed. --- debian/changelog | 7 +++++++ grml-terminalserver-config | 12 +++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index bffcd90..7536d58 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +grml-terminalserver (0.90) unstable; urgency=low + + * Forgot to adjust $CC in grml-terminalserver-config for new + gcc version. Fixed. + + -- Michael Prokop Thu, 12 Apr 2007 11:05:57 +0200 + grml-terminalserver (0.89) unstable; urgency=low * Update for new grml-terminalserver-data package. diff --git a/grml-terminalserver-config b/grml-terminalserver-config index 194ad98..d073ed9 100755 --- a/grml-terminalserver-config +++ b/grml-terminalserver-config @@ -527,13 +527,11 @@ timeout 0 title Load config from Tftp server configfile (nd)/menu.lst EOT - #execute "./configure --enable-diskless --enable-preset-menu=./preset-menu $cmd_line_" warn || read - if [ -x /usr/bin/gcc-3.4 ] ; then - export CC='gcc-3.4' - else # assume we have gcc-3.3 - export CC='gcc-3.3' - fi - [ -r /lib64 ] && export CC="$CC -m32" + + [ -x /usr/bin/gcc-3.3 ] && export CC='gcc-3.3' + [ -x /usr/bin/gcc-3.4 ] && export CC='gcc-3.4' + [ -x /usr/bin/gcc-4.1 ] && export CC='gcc-4.1' + [ -r /lib64 ] && export CC="$CC -m32" CC="$CC" execute "./configure --enable-preset-menu=./preset-menu $cmd_line_" warn || read CC="$CC" execute "make -j2" warn || read #return 1 -- 2.1.4