fix Depends and fix way of environment handling for executing of gcc

diff --git a/debian/control b/debian/control
index 5adf2a1..d235a09 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.7.2
 
 Package: grml-terminalserver
 Architecture: any
-Depends: grml-shlib (>=1.02.03), grml-terminalserver-data (>=0.62), dialog, dhcp3-server, atftpd (>=0.7.dfsg-1.2), syslinux, gcc-3.3 | gcc-3.4, ipcalc, ash, libc6-dev-i386 [amd64], ia32-libs [amd64]
+Depends: grml-shlib (>=1.02.03), grml-terminalserver-data (>=0.62), dialog, dhcp3-server, atftpd (>=0.7.dfsg-1.2), syslinux, gcc-3.3 [i386] | gcc-3.4 [i386], gcc-3.4 [amd64], ipcalc, ash, libc6-dev-i386 [amd64], ia32-libs [amd64]
 Description: terminalserver for grml
  This software should netboot grml on other computers over the
  network. The terminalserver also works with NON-PXE

diff --git a/grml-terminalserver-config b/grml-terminalserver-config
index 9417c86..ea8777a 100755 (executable)
--- a/grml-terminalserver-config
+++ b/grml-terminalserver-config
@@ -530,14 +530,14 @@ title Load config from Tftp server
 EOT
   #execute "./configure --enable-diskless --enable-preset-menu=./preset-menu $cmd_line_" warn || read
   if [ -x /usr/bin/gcc-3.4 ] ; then
-    CC='gcc-3.4'
+    export CC='gcc-3.4'
   else # assume we have gcc-3.3
-    CC='gcc-3.3'
+    export CC='gcc-3.3'
   fi
-  [ -r /lib64 ] && CC="$CC -m32"
+  [ -r /lib64 ] && export CC="$CC -m32"
 
-  execute "CC=$CC ./configure --enable-preset-menu=./preset-menu $cmd_line_" warn || read
-  execute "make -j2 CC=$CC" warn || read #return 1
+  CC="$CC" execute "./configure --enable-preset-menu=./preset-menu $cmd_line_" warn || read
+  CC="$CC" execute "make -j2" warn || read #return 1
 
   local st1_="stage1/stage1"
   local st2_="stage2/stage2"