HCoop
/
ntk
/
apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'upstream/debian/sid' into feature/install-progress...
[ntk/apt.git]
/
buildlib
/
defaults.mak
diff --git
a/buildlib/defaults.mak
b/buildlib/defaults.mak
index
c10813e
..
599b9ed
100644
(file)
--- a/
buildlib/defaults.mak
+++ b/
buildlib/defaults.mak
@@
-121,7
+121,7
@@
MKDIRS := $(BIN)
all: dirs binary doc
binary: library program
maintainer-clean dist-clean distclean pristine sanity: veryclean
all: dirs binary doc
binary: library program
maintainer-clean dist-clean distclean pristine sanity: veryclean
-startup headers library clean veryclean program test update-po:
+startup headers library clean veryclean program test update-po
manpages debiandoc
:
veryclean:
echo Very Clean done for $(SUBDIR)
veryclean:
echo Very Clean done for $(SUBDIR)
@@
-172,12
+172,11
@@
ifeq ($(NUM_PROCS),1)
PARALLEL_RUN=no
endif
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