X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=builder;h=7438909283501d46fdc892067c10087e7e922040;hb=1205e2bab6122bdefcc50da7b411afbd6df854e3;hp=8e11a89fcea8b1db842bb88cc887a0592adc24b1;hpb=d4d9849794cea74e29cd6396c783f9b9103b74b1;p=moonshot.git

diff --git a/builder b/builder
index 8e11a89..7438909 100755
--- a/builder
+++ b/builder
@@ -68,21 +68,25 @@ def command_output(args) :
 
 def build(package):
     with current_directory(package):
+        try: os.makedirs( "m4")
+        except OSError: pass
         run_cmd(('autoreconf', '-i', '-f'))
-        configure_command = ' '.join([
-                                      './configure'] + configure_opts)
+        configure_command = [
+                                      './configure'] + configure_opts
         if len(schroot_command) > 0:
-            configure_command = schroot_command + " -- " \
+            configure_command = schroot_command.split(' ') \
                 + configure_command
-        print configure_command
+        print ' '.join(configure_command)
         sys.stdout.flush()
-        run_cmd(configure_command, shell=True)
+        run_cmd(configure_command, shell=False)
         if dist:
             try: os.mkdir('doc/api')
             except: pass
-            run_cmd(schroot_command +' make dist-gzip', shell=True)
-            run_cmd('cp *.tar.gz ' +dist_dir, shell=True)
-        run_cmd(schroot_command + ' make', shell=True)
+            #Currently freeradius's make dist is broken
+            if not package == "freeradius-server":
+                run_cmd(root_command +' make dist-gzip', shell=True)
+                run_cmd('cp *.tar.gz ' +dist_dir, shell=True)
+        run_cmd(schroot_command + ' make -j3', shell=True)
 
 def make_install(package):
     with current_directory(package):
@@ -138,9 +142,8 @@ 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,-rpath="+prefix+"/lib",
+                  'CPPFLAGS=-I '+prefix+'/include',
                   '--with-system-libtool', '--with-system-libltdl',
                   '--enable-tls', '--with-gssapi='+prefix,
                   "--with-xmltooling="+prefix, 
@@ -153,8 +156,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