fix typo
[moonshot.git] / builder
diff --git a/builder b/builder
index 5d0ac73..7438909 100755 (executable)
--- a/builder
+++ b/builder
@@ -68,6 +68,8 @@ 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 = [
                                       './configure'] + configure_opts
@@ -80,9 +82,11 @@ def build(package):
         if dist:
             try: os.mkdir('doc/api')
             except: pass
-            run_cmd(root_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,8 +142,7 @@ 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",
+                  "LDFLAGS=-Wl,-L"+prefix+"/lib -Wl,-rpath="+prefix+"/lib",
                   'CPPFLAGS=-I '+prefix+'/include',
                   '--with-system-libtool', '--with-system-libltdl',
                   '--enable-tls', '--with-gssapi='+prefix,