summaryrefslogtreecommitdiff
path: root/buildlib
diff options
context:
space:
mode:
Diffstat (limited to 'buildlib')
-rw-r--r--buildlib/configure.mak4
-rw-r--r--buildlib/defaults.mak17
2 files changed, 10 insertions, 11 deletions
diff --git a/buildlib/configure.mak b/buildlib/configure.mak
index 68d0535b4..7052e4c56 100644
--- a/buildlib/configure.mak
+++ b/buildlib/configure.mak
@@ -2,7 +2,7 @@
# This make fragment is included by the toplevel make to handle configure
# and setup. It defines a target called startup that when run will init
-# the build directory, generate configure from configure.in, create aclocal
+# the build directory, generate configure from configure.ac, create aclocal
# and has rules to run config.status should one of the .in files change.
# Input
@@ -48,7 +48,7 @@ missing-config-files:
@echo "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD"
exit 100
-configure: aclocal.m4 configure.in buildlib/config.guess buildlib/config.sub
+configure: aclocal.m4 configure.ac buildlib/config.guess buildlib/config.sub
autoconf
aclocal.m4: $(wildcard buildlib/*.m4)
diff --git a/buildlib/defaults.mak b/buildlib/defaults.mak
index 5b970876a..599b9ed85 100644
--- a/buildlib/defaults.mak
+++ b/buildlib/defaults.mak
@@ -172,12 +172,11 @@ ifeq ($(NUM_PROCS),1)
PARALLEL_RUN=no
endif
-# mvo: commented out, lead to build failures in the arch-build target
-#ifndef PARALLEL_RUN
-# PARALLEL_RUN=yes
-# .EXPORT: PARALLEL_RUN
-# # handle recursion
-# ifneq ($(NUM_PROCS),)
-# MAKEFLAGS += -j $(NUM_PROCS)
-# endif
-#endif
+ifndef PARALLEL_RUN
+ PARALLEL_RUN=yes
+ export PARALLEL_RUN
+ # handle recursion
+ ifneq ($(NUM_PROCS),)
+ MAKEFLAGS += -j $(NUM_PROCS)
+ endif
+endif