Update mech_eap to include null acceptor name support

[moonshot.git] / builder

diff --git a/builder b/builder
index cd53d7f..5d0ac73 100755 (executable)
--- a/builder
+++ b/builder
@@ -138,9 +138,9 @@ prefix = options.prefix
 root_command = options.root_command
 dist = options.dist
 configure_opts = ['--prefix', prefix,
-                  "LDFLAGS='-Wl,-L"+prefix+"/lib -Wl,-L/usr/lib/freeradius"
-                  + " -Wl,-rpath="+prefix+"/lib'",
-                  'CPPFLAGS="-I '+prefix+'/include"',
+                  "LDFLAGS=-Wl,-L"+prefix+"/lib -Wl,-L/usr/lib/freeradius"
+                  + " -Wl,-rpath="+prefix+"/lib",
+                  'CPPFLAGS=-I '+prefix+'/include',
                   '--with-system-libtool', '--with-system-libltdl',
                   '--enable-tls', '--with-gssapi='+prefix,
                   "--with-xmltooling="+prefix, 
@@ -153,8 +153,9 @@ if tar_file is not None: dist = True
 our_schroot = None
 if options.schroot is not None:
     our_schroot = Schroot(options.schroot)
-    schroot_command = "schroot -r -c " + our_schroot.name + ' --'
-    root_command = schroot_command + " -u root"
+    schroot_command_base = "schroot -r -c " + our_schroot.name
+    root_command = schroot_command_base + " -u root --"
+    schroot_command = schroot_command_base + ' --'
 
 all_packages = read_packages()
 if len(packages) == 0: packages = all_packages