merged from debian-sid

[apt.git] / buildlib / defaults.mak

diff --git a/buildlib/defaults.mak b/buildlib/defaults.mak
index 3ecf4ba27d254a1d6d4a24d889bbb8c1f052b5aa..a171522d55c5e59641180aceaabd450a731928f2 100644 (file)
--- a/buildlib/defaults.mak
+++ b/buildlib/defaults.mak
@@ -70,6 +70,9 @@ LIB := $(BIN)
 OBJ := $(BUILD)/obj/$(SUBDIR)
 DEP := $(OBJ)
 DOC := $(BUILD)/docs
+PO := $(BUILD)/po
+LOCALE := $(BUILD)/locale
+PO_DOMAINS := $(BUILD)/po/domains
 
 # Module types
 LIBRARY_H = $(BASE)/buildlib/library.mak
@@ -80,7 +83,9 @@ PYTHON_H = $(BASE)/buildlib/python.mak
 COPY_H = $(BASE)/buildlib/copy.mak
 YODL_MANPAGE_H = $(BASE)/buildlib/yodl_manpage.mak
 SGML_MANPAGE_H = $(BASE)/buildlib/sgml_manpage.mak
+XML_MANPAGE_H = $(BASE)/buildlib/xml_manpage.mak
 FAIL_H = $(BASE)/buildlib/fail.mak
+PODOMAIN_H = $(BASE)/buildlib/podomain.mak
 
 include $(BUILD)/environment.mak
 
@@ -109,7 +114,7 @@ CPPFLAGS+= -I$(INCLUDE)
 LDFLAGS+= -L$(LIB)
 
 # Directors to create
-MKDIRS := $(BIN)
+MKDIRS := $(BIN) 
 
 # Phony rules. Other things hook these by appending to the dependency
 # list
@@ -169,11 +174,12 @@ ifeq ($(NUM_PROCS),1)
   PARALLEL_RUN=no
 endif
 
-ifndef PARALLEL_RUN
- PARALLEL_RUN=yes
- .EXPORT: PARALLEL_RUN
- # handle recursion
- ifneq ($(NUM_PROCS),)
-  MAKEFLAGS += -j $(NUM_PROCS)
- endif
-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