Репозиторий Sisyphus
Последнее обновление: 1 октября 2023 | Пакетов: 18631 | Посещений: 37600969
en ru br
Репозитории ALT
S:25.3-alt1
D:R12B.3-alt0.7
5.1: R12B.5-alt11.1
4.1: R11B.5-alt1
4.0: R11B.5-alt1
3.0: R10B.0-alt1
+backports:R10B.10-alt0.M30.1
www.altlinux.org/Changes

Другие репозитории
Upstream:12.B.1

Группа :: Development/Erlang
Пакет: erlang

 Главная   Изменения   Спек   Патчи   Sources   Загрузить   Gear   Bugs and FR  Repocop 

Патч: otp-R14B-4a-alt1.patch
Скачать


 Makefile.in                                 |    5 ++---
 configure.in                                |   11 +++++++++++
 erts/autoconf/config.sub                    |   17 +++++++++++------
 erts/configure.in                           |    2 ++
 erts/emulator/Makefile.in                   |    4 ++++
 erts/emulator/pcre/Makefile.in              |    2 ++
 erts/start_scripts/Makefile                 |    9 +++++----
 lib/asn1/src/Makefile                       |    3 +++
 lib/common_test/configure.in                |    2 ++
 lib/common_test/src/Makefile                |    2 ++
 lib/compiler/src/Makefile                   |    2 ++
 lib/cosEvent/src/Makefile                   |    5 +++++
 lib/cosEventDomain/src/Makefile             |    5 +++++
 lib/cosFileTransfer/src/Makefile            |    3 +++
 lib/cosNotification/src/Makefile            |    7 +++++++
 lib/cosProperty/src/Makefile                |    3 +++
 lib/cosTime/src/Makefile                    |    5 +++++
 lib/cosTransactions/src/Makefile            |    3 +++
 lib/erl_interface/configure.in              |    2 ++
 lib/erl_interface/src/Makefile              |    2 ++
 lib/eunit/src/Makefile                      |    1 +
 lib/gs/src/Makefile                         |    2 ++
 lib/ic/examples/pre_post_condition/Makefile |    2 ++
 lib/ic/src/Makefile                         |    1 +
 lib/megaco/src/binary/Makefile              |    1 +
 lib/megaco/src/binary/depend.mk             |    2 +-
 lib/megaco/src/text/Makefile                |    2 +-
 lib/odbc/Makefile                           |    1 +
 lib/orber/COSS/CosNaming/Makefile           |    4 +++-
 lib/orber/examples/Stack/Makefile           |    2 ++
 lib/orber/src/Makefile                      |    3 ++-
 lib/os_mon/c_src/Makefile.in                |   16 +++++++++-------
 lib/os_mon/mibs/Makefile                    |    6 ++++++
 lib/otp_mibs/mibs/Makefile                  |    1 +
 lib/public_key/asn1/Makefile                |    4 +++-
 lib/snmp/mibs/Makefile.in                   |    4 ++++
 lib/snmp/src/compile/Makefile               |    2 +-
 lib/ssh/src/Makefile                        |    6 ++++--
 lib/ssl/c_src/Makefile                      |    2 ++
 lib/ssl/c_src/Makefile.in                   |    2 +-
 lib/stdlib/src/Makefile                     |    2 ++
 lib/tools/c_src/Makefile                    |    1 +
 lib/tools/src/Makefile                      |    2 ++
 lib/xmerl/src/Makefile                      |    6 ++++--
 make/otp.mk.in                              |    4 ++++
 45 files changed, 142 insertions(+), 31 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index d758b47..60299a1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -486,6 +486,7 @@ preloaded:
 		$(MAKE) opt BUILD_ALL=true	
 
 dep depend:
+	@mkdir -p $(ERL_TOP)/lib/kernel/ebin
 	test X"$$ERTS_SKIP_DEPEND" = X"true" || (cd erts/emulator && ERL_TOP=$(ERL_TOP) $(MAKE) generate depend)
 	test X"$$ERTS_SKIP_DEPEND" = X"true" || (cd erts/lib_src && ERL_TOP=$(ERL_TOP) $(MAKE) depend)
 
@@ -627,7 +628,7 @@ tertiary_bootstrap_build:
 	  ERL_TOP=$(ERL_TOP) PATH=$(BOOT_PREFIX)$${PATH} \
 		$(MAKE) opt TERTIARY_BOOTSTRAP=true
 
-tertiary_bootstrap_copy:
+tertiary_bootstrap_copy: tertiary_bootstrap_build
 	if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/snmp ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/snmp ; fi
 	if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/snmp/ebin ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/snmp/ebin ; fi
 	if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/snmp/include ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/snmp/include ; fi
@@ -835,8 +836,6 @@ primary_bootstrap_mkdirs:
 		|| mkdir -p $(BOOTSTRAP_TOP)/lib/compiler/egen 
 	test -d $(BOOTSTRAP_TOP)/lib/compiler/ebin \
 		|| mkdir -p $(BOOTSTRAP_TOP)/lib/compiler/ebin 
-	test -d $(BOOTSTRAP_TOP)/lib/orber/include \
-		|| mkdir -p $(BOOTSTRAP_TOP)/lib/orber/include
 
 primary_bootstrap_copy:
 	cp -f lib/kernel/include/*.hrl $(BOOTSTRAP_TOP)/lib/kernel/include
diff --git a/configure.in b/configure.in
index 36b33ec..7761449 100644
--- a/configure.in
+++ b/configure.in
@@ -78,6 +78,11 @@ esac
 test "X$ERL_TOP" != "X" || ERL_TOP="$srcdir"
 AC_SUBST(ERL_TOP)
 
+dnl Makes empty dirs
+if test -s mkdir.list; then
+    mkdir -p `grep -v '#' mkdir.list`
+fi
+
 dnl
 dnl Aux programs are found in erts/autoconf
 dnl
@@ -122,6 +127,12 @@ if test $CROSS_COMPILING = yes -a $BOOTSTRAP_ONLY = yes; then
     AC_MSG_ERROR([Cannot both cross compile and build a bootstrap system])
 fi
 
+dnl Makes empty dirs
+if test -s mkdir.list; then
+    mkdir -p `grep -v '#' mkdir.list`
+fi
+
+
 dnl Checks for programs.
 
 AC_PROG_CC
diff --git a/erts/autoconf/config.sub b/erts/autoconf/config.sub
index f43233b..3f2d531 100755
--- a/erts/autoconf/config.sub
+++ b/erts/autoconf/config.sub
@@ -831,7 +831,7 @@ case $basic_machine in
 	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
 		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
+	pentiumpro | p6 | 6x86 | athlon | athlon_[xm]p)
 		basic_machine=i686-pc
 		;;
 	pentiumii | pentium2 | pentiumiii | pentium3)
@@ -840,17 +840,22 @@ case $basic_machine in
 	pentium4)
 		basic_machine=i786-pc
 		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+	pentium-* | p5-* | k5-* | nexgen-* | viac3-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentiumpro-* | p6-* | 6x86-* | athlon-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+	pentiumii-*)
+		basic_machine=pentium2-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumiii-*)
+		basic_machine=pentium3-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	athlon_mp-*)
+		basic_machine=athlon_xp-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentium4-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+	athlon-* | athlon_xp-* | i[3456]86-* | k6 | pentium[234]-*)
 		;;
 	pn)
 		basic_machine=pn-gould
diff --git a/erts/configure.in b/erts/configure.in
index 3b9be41..00bf3a4 100644
--- a/erts/configure.in
+++ b/erts/configure.in
@@ -3998,6 +3998,8 @@ if test "x$SSL_APP" != "x" ; then
 		"$erl_xcomp_isysroot/cygdrive/c/kerberos/include" \
 		"$erl_xcomp_isysroot/usr/local/kerberos/include" \
 		"$erl_xcomp_isysroot/usr/kerberos/include" \
+		"$erl_xcomp_isysroot/usr/include/krb5/krb5" \
+		"$erl_xcomp_isysroot/usr/include/krb5" \
 		"$erl_xcomp_isysroot/usr/include"
 	do
             if test -f "$dir/krb5.h" ; then
diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in
index 620402f..fd1bef1 100644
--- a/erts/emulator/Makefile.in
+++ b/erts/emulator/Makefile.in
@@ -511,6 +511,8 @@ $(TTF_DIR)/beam_opcodes.h $(TTF_DIR)/beam_opcodes.c: $(OPCODE_TABLES) utils/beam
 		-outdir $(TTF_DIR) \
 		-emulator $(OPCODE_TABLES)
 
+$(OBJDIR)/beam_opcodes.o: $(TTF_DIR)/beam_opcodes.h $(TTF_DIR)/beam_opcodes.c
+
 # bif and atom table
 ATOMS=	beam/atom.names
 BIFS =	beam/bif.tab
@@ -913,6 +915,8 @@ endif
 # ----------------------------------------------------------------------
 # The emulator itself
 
+$(DEPLIBS): zlib pcre
+
 ifeq ($(TARGET), win32)
 # Only the basic erlang to begin with eh?
 $(BINDIR)/$(EMULATOR_EXECUTABLE): $(INIT_OBJS) $(OBJS) $(DEPLIBS)
diff --git a/erts/emulator/pcre/Makefile.in b/erts/emulator/pcre/Makefile.in
index f62700e..a10b74d 100644
--- a/erts/emulator/pcre/Makefile.in
+++ b/erts/emulator/pcre/Makefile.in
@@ -45,6 +45,8 @@ GENINC = pcre_exec_loop_break_cases.inc
 
 include $(ERL_TOP)/make/target.mk
 
+MAKEOPTS += -j1
+
 # On windows we need a separate zlib during debug build
 ifeq ($(TARGET),win32)
 
diff --git a/erts/start_scripts/Makefile b/erts/start_scripts/Makefile
index 4df7568..7ab9652 100644
--- a/erts/start_scripts/Makefile
+++ b/erts/start_scripts/Makefile
@@ -29,6 +29,7 @@ LIBPATH= $(ERL_TOP)/lib
 SCRIPT_PATH = -I$(LIBPATH)/kernel/ebin -I$(LIBPATH)/stdlib/ebin -I$(LIBPATH)/sasl/ebin
 BOOTSTRAP_LIBPATH=$(BOOTSTRAP_TOP)/lib
 BOOTSTRAP_SCRIPT_PATH = -I$(BOOTSTRAP_LIBPATH)/kernel/ebin -I$(BOOTSTRAP_LIBPATH)/stdlib/ebin
+SASL_FLAGS += -pz $(ERL_TOP)/lib/sasl/ebin
 
 INSTALL_SCRIPTS = \
 	$(SS_ROOT)/start_clean.script \
@@ -67,7 +68,7 @@ rel:	$(REL_SCRIPTS)
 RELEASES.src:
 	$(INSTALL_DIR) $(SS_TMP)
 	( cd $(SS_TMP) && \
-	$(ERL) -noinput +B -eval 'release_handler:create_RELEASES("%ERL_ROOT%", "$(SS_ROOT)", "$(SS_ROOT)/start_sasl.rel", []), halt()')
+	$(ERL) -noinput +B $(SASL_FLAGS) -eval 'release_handler:create_RELEASES("%ERL_ROOT%", "$(SS_ROOT)", "$(SS_ROOT)/start_sasl.rel", []), halt()')
 	mv RELEASES RELEASES.src
 
 $(SS_ROOT)/start_clean.script \
@@ -128,17 +129,17 @@ $(SS_ROOT)/start_all_example.rel:	$(SS_ROOT)/start_all_example.rel.src \
 $(ERL_TOP)/bin/start.script:
 	$(INSTALL_DIR) $(SS_TMP)
 	( cd $(SS_TMP) && \
-	  $(ERLC) $(SCRIPT_PATH) +otp_build -o $@ $(SS_ROOT)/start_clean.rel )
+	  $(ERLC) $(SASL_FLAGS) $(SCRIPT_PATH) +otp_build -o $@ $(SS_ROOT)/start_clean.rel )
 
 $(ERL_TOP)/bin/start_sasl.script:
 	$(INSTALL_DIR) $(SS_TMP)
 	( cd $(SS_TMP) && \
-	  $(ERLC) $(SCRIPT_PATH) +otp_build -o $@ $(SS_ROOT)/start_sasl.rel )
+	  $(ERLC) $(SASL_FLAGS) $(SCRIPT_PATH) +otp_build -o $@ $(SS_ROOT)/start_sasl.rel )
 
 $(ERL_TOP)/bin/start_clean.script:
 	$(INSTALL_DIR) $(SS_TMP)
 	( cd $(SS_TMP) && \
-	  $(ERLC) $(SCRIPT_PATH) +otp_build -o $@ $(SS_ROOT)/start_clean.rel )
+	  $(ERLC) $(SASL_FLAGS) $(SCRIPT_PATH) +otp_build -o $@ $(SS_ROOT)/start_clean.rel )
 
 ## Special target used from system/build/Makefile for source code release bootstrap.
 bootstrap_scripts: $(SS_ROOT)/start_clean.rel
diff --git a/lib/asn1/src/Makefile b/lib/asn1/src/Makefile
index 2733cde..fc5ad47 100644
--- a/lib/asn1/src/Makefile
+++ b/lib/asn1/src/Makefile
@@ -137,12 +137,15 @@ info:
 # ----------------------------------------------------
 
 $(EBIN)/asn1ct.$(EMULATOR):asn1ct.erl
+	@mkdir -p $(EBIN)
 	 $(ERLC) -b$(EMULATOR) -o$(EBIN) $(ERL_COMPILE_FLAGS) -Dvsn=\"$(VSN)\" $<
 
 $(APP_TARGET): $(APP_SRC) ../vsn.mk
+	@mkdir -p $(EBIN)
 	sed -e 's;%VSN%;$(VSN);' $< > $@
 
 $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
+	@mkdir -p $(EBIN)
 	sed -e 's;%VSN%;$(VSN);' $< > $@
 
 
diff --git a/lib/common_test/configure.in b/lib/common_test/configure.in
index b2e6ad9..3649c59 100755
--- a/lib/common_test/configure.in
+++ b/lib/common_test/configure.in
@@ -2,6 +2,8 @@ AC_INIT()
 
 AC_CONFIG_AUX_DIR(priv/auxdir)
 
+mkdir -p ./priv/lib
+
 if test "X$host" != "Xfree_source" -a "X$host" != "Xwin32"; then
     AC_CANONICAL_HOST
 else
diff --git a/lib/common_test/src/Makefile b/lib/common_test/src/Makefile
index 84b122b..49d9657 100644
--- a/lib/common_test/src/Makefile
+++ b/lib/common_test/src/Makefile
@@ -30,6 +30,8 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
 include ../vsn.mk
 VSN=$(COMMON_TEST_VSN)
 
+MAKEFLAGS += -j1
+
 # ----------------------------------------------------
 # Release directory specification
 # ----------------------------------------------------
diff --git a/lib/compiler/src/Makefile b/lib/compiler/src/Makefile
index 1238d11..268a122 100644
--- a/lib/compiler/src/Makefile
+++ b/lib/compiler/src/Makefile
@@ -122,6 +122,8 @@ ERL_COMPILE_FLAGS += +inline +warn_unused_import \
  +warnings_as_errors \
  -I../../stdlib/include -I$(EGEN) -W
 
+YRL_FLAGS += -pz $(ERL_TOP)/lib/parsetools/ebin
+
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
diff --git a/lib/cosEvent/src/Makefile b/lib/cosEvent/src/Makefile
index a62d47c..4ef9fdd 100644
--- a/lib/cosEvent/src/Makefile
+++ b/lib/cosEvent/src/Makefile
@@ -30,6 +30,8 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
 include ../vsn.mk
 VSN=$(COSEVENT_VSN)
 
+MAKEFLAGS += -j1
+
 # ----------------------------------------------------
 # Release directory specification
 # ----------------------------------------------------
@@ -150,6 +152,7 @@ ERL_COMPILE_FLAGS += \
 	$(ERL_IDL_FLAGS) \
 	-I$(ERL_TOP)/lib/orber/include \
 	-I$(ERL_TOP)/lib/cosEvent/include \
+	-I$(ERL_TOP)/lib \
 	+'{parse_transform,sys_pre_attributes}' \
 	+'{attribute,insert,app_vsn,"cosEvent_$(COSEVENT_VSN)"}' 
 
@@ -179,6 +182,7 @@ docs:
 # ----------------------------------------------------
 $(GEN_ERL_FILES1) $(EXTERNAL_GEN_HRL_FILES1): CosEventChannelAdmin.idl
 	erlc $(ERL_IDL_FLAGS) +'{cfgfile,"CosEventChannelAdmin.cfg"}' CosEventChannelAdmin.idl
+	@mkdir -p $(EXTERNAL_INC_PATH)
 	mv $(GEN_HRL_FILES1) $(EXTERNAL_INC_PATH)
 
 $(GEN_ERL_FILES2) $(GEN_HRL_FILES2): cosEventApp.idl
@@ -186,6 +190,7 @@ $(GEN_ERL_FILES2) $(GEN_HRL_FILES2): cosEventApp.idl
 
 $(GEN_ERL_FILES3) $(EXTERNAL_GEN_HRL_FILES3): CosEventComm.idl
 	erlc $(ERL_IDL_FLAGS) CosEventComm.idl
+	@mkdir -p $(EXTERNAL_INC_PATH)
 	mv $(GEN_HRL_FILES3) $(EXTERNAL_INC_PATH)
 
 # ----------------------------------------------------
diff --git a/lib/cosEventDomain/src/Makefile b/lib/cosEventDomain/src/Makefile
index 56a67cd..79edffd 100644
--- a/lib/cosEventDomain/src/Makefile
+++ b/lib/cosEventDomain/src/Makefile
@@ -30,6 +30,8 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
 include ../vsn.mk
 VSN=$(COSEVENTDOMAIN_VSN)
 
+MAKEFLAGS += -j1
+
 # ----------------------------------------------------
 # Release directory specification
 # ----------------------------------------------------
@@ -123,6 +125,8 @@ ERL_COMPILE_FLAGS += \
 	-I$(ERL_TOP)/lib/cosNotification/src \
 	-I$(ERL_TOP)/lib/cosEvent/src \
 	-I$(ERL_TOP)/lib/cosEvent/include \
+	-I$(ERL_TOP)/lib/orber/include \
+	-I$(ERL_TOP)/lib \
 	+'{parse_transform,sys_pre_attributes}' \
 	+'{attribute,insert,app_vsn,"cosEventDomain_$(COSEVENTDOMAIN_VSN)"}' 
 
@@ -152,6 +156,7 @@ docs:
 # ----------------------------------------------------
 $(GEN_ERL_FILES) $(EXTERNAL_GEN_HRL_FILES): CosEventDomainAdmin.idl
 	erlc $(ERL_IDL_FLAGS) +'{cfgfile,"CosEventDomainAdmin.cfg"}' CosEventDomainAdmin.idl
+	@mkdir -p $(EXTERNAL_INC_PATH)
 	mv $(GEN_HRL_FILES) $(EXTERNAL_INC_PATH)
 
 # ----------------------------------------------------
diff --git a/lib/cosFileTransfer/src/Makefile b/lib/cosFileTransfer/src/Makefile
index 773ed7f..5333dba 100644
--- a/lib/cosFileTransfer/src/Makefile
+++ b/lib/cosFileTransfer/src/Makefile
@@ -31,6 +31,8 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
 include ../vsn.mk
 VSN=$(COSFILETRANSFER_VSN)
 
+MAKEFLAGS += -j1
+
 # ----------------------------------------------------
 # Release directory specification
 # ----------------------------------------------------
@@ -163,6 +165,7 @@ docs:
 # ----------------------------------------------------
 $(GEN_ERL_FILES) $(GEN_HRL_FILES): CosFileTransfer.idl
 	erlc $(ERL_IDL_FLAGS) +'{cfgfile,"CosFileTransfer.cfg"}' CosFileTransfer.idl
+	@mkdir -p $(EXTERNAL_INC_PATH)
 	mv $(LOCAL_HRL_FILES) $(EXTERNAL_INC_PATH)
 
 # ----------------------------------------------------
diff --git a/lib/cosNotification/src/Makefile b/lib/cosNotification/src/Makefile
index 637c633..f22cda7 100644
--- a/lib/cosNotification/src/Makefile
+++ b/lib/cosNotification/src/Makefile
@@ -31,6 +31,8 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
 include ../vsn.mk
 VSN=$(COSNOTIFICATION_VSN)
 
+MAKEFLAGS += -j1
+
 # ----------------------------------------------------
 # Release directory specification
 # ----------------------------------------------------
@@ -308,6 +310,7 @@ ERL_COMPILE_FLAGS += \
 	+'{attribute,insert,app_vsn,"cosNotification_$(COSNOTIFICATION_VSN)"}' 
 
 YECC_COMPILE_FLAGS =
+YRL_FLAGS += -pz $(ERL_TOP)/lib/parsetools/ebin
 
 # ----------------------------------------------------
 # Targets
@@ -338,17 +341,21 @@ docs:
 # ----------------------------------------------------
 $(GEN_NOTIFICATION_ERL_FILES) $(EXTERNAL_GEN_NOTIFICATION_HRL_FILES): CosNotification.idl
 	erlc $(ERL_IDL_FLAGS) +'{cfgfile,"CosNotification.cfg"}' CosNotification.idl
+	@mkdir -p $(EXTERNAL_INC_PATH)
 	mv $(GEN_NOTIFICATION_HRL_FILES) $(EXTERNAL_INC_PATH)
 $(GEN_CHANNELADMIN_ERL_FILES) $(EXTERNAL_GEN_CHANNELADMIN_HRL_FILES): CosNotifyChannelAdmin.idl
 	erlc $(ERL_IDL_FLAGS) +'{cfgfile,"CosNotifyChannelAdmin.cfg"}' CosNotifyChannelAdmin.idl
+	@mkdir -p $(EXTERNAL_INC_PATH)
 	mv $(GEN_CHANNELADMIN_HRL_FILES) $(EXTERNAL_INC_PATH)
 $(GEN_NOTIFYFILTER_ERL_FILES) $(EXTERNAL_GEN_NOTIFYFILTER_HRL_FILES): CosNotifyFilter.idl
 	erlc $(ERL_IDL_FLAGS) +'{cfgfile,"CosNotifyFilter.cfg"}' CosNotifyFilter.idl
+	@mkdir -p $(EXTERNAL_INC_PATH)
 	mv $(GEN_NOTIFYFILTER_HRL_FILES) $(EXTERNAL_INC_PATH)
 $(GEN_OE_EVENTCOMM_ERL_FILES) $(GEN_OE_EVENTCOMM_HRL_FILES): cosNotificationAppComm.idl
 	erlc $(ERL_IDL_FLAGS) +'{cfgfile,"cosNotificationComm.cfg"}' cosNotificationAppComm.idl
 $(GEN_NOTIFYCOMM_ERL_FILES) $(EXTERNAL_GEN_NOTIFYCOMM_HRL_FILES): CosNotifyComm.idl
 	erlc $(ERL_IDL_FLAGS) +'{cfgfile,"CosNotifyComm.cfg"}' CosNotifyComm.idl
+	@mkdir -p $(EXTERNAL_INC_PATH)
 	mv $(GEN_NOTIFYCOMM_HRL_FILES) $(EXTERNAL_INC_PATH)
 $(GEN_YECC_ERL_FILES) $(GEN_YECC_HRL_FILES): cosNotification_Grammar.yrl
 
diff --git a/lib/cosProperty/src/Makefile b/lib/cosProperty/src/Makefile
index 1d2119d..44dfaaf 100644
--- a/lib/cosProperty/src/Makefile
+++ b/lib/cosProperty/src/Makefile
@@ -31,6 +31,8 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
 include ../vsn.mk
 VSN=$(COSPROPERTY_VSN)
 
+MAKEFLAGS += -j1
+
 # ----------------------------------------------------
 # Release directory specification
 # ----------------------------------------------------
@@ -163,6 +165,7 @@ docs:
 # ----------------------------------------------------
 $(GEN_ERL_FILES) $(GEN_HRL_FILES): CosProperty.idl
 	erlc $(ERL_IDL_FLAGS) +'{cfgfile,"CosProperty.cfg"}' CosProperty.idl
+	@mkdir -p $(EXTERNAL_INC_PATH)
 	mv $(LOCAL_HRL_FILES) $(EXTERNAL_INC_PATH)
 
 
diff --git a/lib/cosTime/src/Makefile b/lib/cosTime/src/Makefile
index 3b6f7ba..b309566 100644
--- a/lib/cosTime/src/Makefile
+++ b/lib/cosTime/src/Makefile
@@ -31,6 +31,8 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
 include ../vsn.mk
 VSN=$(COSTIME_VSN)
 
+MAKEFLAGS += -j1
+
 # ----------------------------------------------------
 # Release directory specification
 # ----------------------------------------------------
@@ -178,14 +180,17 @@ docs:
 # ----------------------------------------------------
 $(GEN_TIMEBASE_ERL_FILES) $(EXTERNAL_TIMEBASE_HRL_FILES): TimeBase.idl
 	erlc $(ERL_IDL_FLAGS) TimeBase.idl
+	@mkdir -p $(EXTERNAL_INC_PATH)
 	mv $(GEN_TIMEBASE_HRL_FILES) $(EXTERNAL_INC_PATH)
 
 $(GEN_COSTIME_ERL_FILES) $(EXTERNAL_COSTIME_HRL_FILES): CosTime.idl
 	erlc $(ERL_IDL_FLAGS) +'{cfgfile,"CosTime.cfg"}' CosTime.idl
+	@mkdir -p $(EXTERNAL_INC_PATH)
 	mv $(GEN_COSTIME_HRL_FILES) $(EXTERNAL_INC_PATH)
 
 $(GEN_COSTIMEREVENT_ERL_FILES) $(EXTERNAL_COSTIMEREVENT_HRL_FILES): CosTimerEvent.idl
 	erlc $(ERL_IDL_FLAGS) +'{cfgfile,"CosTimerEvent.cfg"}' CosTimerEvent.idl
+	@mkdir -p $(EXTERNAL_INC_PATH)
 	mv $(GEN_COSTIMEREVENT_HRL_FILES) $(EXTERNAL_INC_PATH)
 
 # ----------------------------------------------------
diff --git a/lib/cosTransactions/src/Makefile b/lib/cosTransactions/src/Makefile
index 7e10ec1..6e591b3 100644
--- a/lib/cosTransactions/src/Makefile
+++ b/lib/cosTransactions/src/Makefile
@@ -32,6 +32,8 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
 include ../vsn.mk
 VSN=$(COSTRANSACTIONS_VSN)
 
+MAKEFLAGS += -j1
+
 # ----------------------------------------------------
 # Release directory specification
 # ----------------------------------------------------
@@ -157,6 +159,7 @@ docs:
 # ----------------------------------------------------
 $(GEN_ERL_FILES) $(EXTERNAL_GEN_HRL_FILES): CosTransactions.idl
 	erlc $(ERL_IDL_FLAGS) +'{cfgfile,"CosTransactions.cfg"}' CosTransactions.idl
+	@mkdir -p $(EXTERNAL_INC_PATH)
 	mv $(GEN_HRL_FILES) $(EXTERNAL_INC_PATH)
 
 # ----------------------------------------------------
diff --git a/lib/erl_interface/configure.in b/lib/erl_interface/configure.in
index 72ac8c7..5ae24db 100644
--- a/lib/erl_interface/configure.in
+++ b/lib/erl_interface/configure.in
@@ -56,6 +56,8 @@ esac
 
 AC_CONFIG_AUX_DIR([$srcdir/src/auxdir])
 
+mkdir -p ./priv
+
 if test "X$host" != "Xfree_source" -a "X$host" != "Xwin32"; then
     AC_CANONICAL_HOST
 else
diff --git a/lib/erl_interface/src/Makefile b/lib/erl_interface/src/Makefile
index 5f0367b..72adb78 100644
--- a/lib/erl_interface/src/Makefile
+++ b/lib/erl_interface/src/Makefile
@@ -24,6 +24,8 @@
 
 include $(ERL_TOP)/make/target.mk
 
+MAKEFLAGS += -j1
+
 debug opt shared purify quantify purecov gcov:
 	$(MAKE) -f $(TARGET)/Makefile TYPE=$@
 
diff --git a/lib/eunit/src/Makefile b/lib/eunit/src/Makefile
index 4897c20..4cf052e 100644
--- a/lib/eunit/src/Makefile
+++ b/lib/eunit/src/Makefile
@@ -21,6 +21,7 @@ RELSYSDIR = $(RELEASE_PATH)/lib/eunit-$(VSN)
 # Common Macros
 #
 
+MAKEFLAGS += -j1
 EBIN = ../ebin
 INCLUDE=../include
 
diff --git a/lib/gs/src/Makefile b/lib/gs/src/Makefile
index a648d3c..ebacf0e 100644
--- a/lib/gs/src/Makefile
+++ b/lib/gs/src/Makefile
@@ -27,6 +27,8 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
 include ../vsn.mk
 VSN=$(GS_VSN)
 
+MAKEFLAGS += -j1
+
 # ----------------------------------------------------
 # Release directory specification
 # ----------------------------------------------------
diff --git a/lib/ic/examples/pre_post_condition/Makefile b/lib/ic/examples/pre_post_condition/Makefile
index 68e2168..58cee65 100644
--- a/lib/ic/examples/pre_post_condition/Makefile
+++ b/lib/ic/examples/pre_post_condition/Makefile
@@ -46,6 +46,8 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
 include ../../vsn.mk
 VSN=$(IC_VSN)
 
+MAKEFLAGS += -j1
+
 # ----------------------------------------------------
 # Release directory specification
 # ----------------------------------------------------
diff --git a/lib/ic/src/Makefile b/lib/ic/src/Makefile
index 5dac304..d744868 100644
--- a/lib/ic/src/Makefile
+++ b/lib/ic/src/Makefile
@@ -161,6 +161,7 @@ ERL_COMPILE_FLAGS += \
 	+'{attribute,insert,app_vsn,"ic_$(VSN)"}' \
 	-D'COMPILERVSN="$(VSN)"'
 YRL_FLAGS = -Iicyeccpre.hrl
+YRL_FLAGS += -pz $(ERL_TOP)/lib/parsetools/ebin
 
 # ----------------------------------------------------
 # Targets
diff --git a/lib/megaco/src/binary/Makefile b/lib/megaco/src/binary/Makefile
index d594f34..4334e9b 100644
--- a/lib/megaco/src/binary/Makefile
+++ b/lib/megaco/src/binary/Makefile
@@ -31,6 +31,7 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
 include ../../vsn.mk
 VSN=$(MEGACO_VSN)
 
+MAKEFLAGS += -j1
 
 # ----------------------------------------------------
 # Release directory specification
diff --git a/lib/megaco/src/binary/depend.mk b/lib/megaco/src/binary/depend.mk
index 5ec4977..252c501 100644
--- a/lib/megaco/src/binary/depend.mk
+++ b/lib/megaco/src/binary/depend.mk
@@ -37,7 +37,7 @@
 # This means that the ASN.1 runtime library will be inlined.
 #
 
-ASN1_CT_OPTS += +noobj
+ASN1_CT_OPTS += +noobj -pz $(ERL_TOP)/lib/asn1/ebin
 ifeq ($(MEGACO_INLINE_ASN1_RT),true)
 # We need atleast version 1.4.6 of the ANS.1 application
 ASN1_CT_OPTS += +inline
diff --git a/lib/megaco/src/text/Makefile b/lib/megaco/src/text/Makefile
index b2e8e76..3665c38 100644
--- a/lib/megaco/src/text/Makefile
+++ b/lib/megaco/src/text/Makefile
@@ -75,7 +75,7 @@ ERL_COMPILE_FLAGS += \
 ifeq ($(YRL_VERBOSE),true)
 YRL_FLAGS += -v 
 endif
-
+YRL_FLAGS += -pz $(ERL_TOP)/lib/parsetools/ebin
 
 # ----------------------------------------------------
 # Targets
diff --git a/lib/odbc/Makefile b/lib/odbc/Makefile
index 4cc48cb..c073d4f 100644
--- a/lib/odbc/Makefile
+++ b/lib/odbc/Makefile
@@ -54,6 +54,7 @@ else
   APP_INSTALL_DIR = /tmp/lib/erlang
 endif
 
+MAKEFLAGS += -j1
 
 # ----------------------------------------------------
 # Default Subdir Targets
diff --git a/lib/orber/COSS/CosNaming/Makefile b/lib/orber/COSS/CosNaming/Makefile
index d3deec7..f822cfc 100644
--- a/lib/orber/COSS/CosNaming/Makefile
+++ b/lib/orber/COSS/CosNaming/Makefile
@@ -28,6 +28,8 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
 include ../../vsn.mk
 VSN=$(ORBER_VSN)
 
+MAKEFLAGS += -j1
+
 # ----------------------------------------------------
 # Release directory specification
 # ----------------------------------------------------
@@ -93,7 +95,7 @@ APP_FILE =
 # ----------------------------------------------------
 # FLAGS
 # ----------------------------------------------------
-ERL_IDL_FLAGS += -pa $(ERL_TOP)/lib/orber/ebin
+ERL_IDL_FLAGS += -pa $(ERL_TOP)/lib/orber/ebin -pz $(ERL_TOP)/lib/ic/ebin
 # The -pa option is just used temporary until erlc can handle 
 # includes from other directories than ../include .
 ERL_COMPILE_FLAGS += \
diff --git a/lib/orber/examples/Stack/Makefile b/lib/orber/examples/Stack/Makefile
index 6e7f292..a3c2ce2 100644
--- a/lib/orber/examples/Stack/Makefile
+++ b/lib/orber/examples/Stack/Makefile
@@ -29,6 +29,8 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
 include ../../vsn.mk
 VSN=$(ORBER_VSN)
 
+MAKEFLAGS += -j1
+
 # ----------------------------------------------------
 # Release directory specification
 # ----------------------------------------------------
diff --git a/lib/orber/src/Makefile b/lib/orber/src/Makefile
index ccc4493..d36f3ed 100644
--- a/lib/orber/src/Makefile
+++ b/lib/orber/src/Makefile
@@ -29,6 +29,7 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
 # ----------------------------------------------------
 include ../vsn.mk
 
+MAKEFLAGS += -j1
 
 # ----------------------------------------------------
 # Release directory specification
@@ -191,7 +192,7 @@ APP_TARGET = $(EBIN)/$(APP_FILE)
 # ----------------------------------------------------
 # FLAGS
 # ----------------------------------------------------
-ERL_IDL_FLAGS += -pa $(ERL_TOP)/lib/orber/ebin
+ERL_IDL_FLAGS += -pa $(ERL_TOP)/lib/orber/ebin -pz $(ERL_TOP)/lib/ic/ebin
 # The -pa option is just used temporary until erlc can handle 
 # includes from other directories than ../include .
 ERL_COMPILE_FLAGS += $(ERL_IDL_FLAGS) \
diff --git a/lib/os_mon/c_src/Makefile.in b/lib/os_mon/c_src/Makefile.in
index 1a371eb..f1fc0c1 100644
--- a/lib/os_mon/c_src/Makefile.in
+++ b/lib/os_mon/c_src/Makefile.in
@@ -82,13 +82,7 @@ ALL_CFLAGS = @CFLAGS@ @DEFS@ $(CFLAGS)
 # Targets
 # ----------------------------------------------------
 
-debug opt: $(OBJDIR) $(BINDIR) $(TARGET_FILES)
-
-$(OBJDIR):
-	-@mkdir -p $(OBJDIR)
-
-$(BINDIR):
-	-@mkdir -p $(BINDIR)
+debug opt: $(TARGET_FILES)
 
 clean:
 	rm -f $(TARGET_FILES)
@@ -101,27 +95,35 @@ docs:
 # ----------------------------------------------------
 
 $(BINDIR)/win32sysinfo.exe: $(OBJDIR)/win32sysinfo.o $(ENTRY_OBJ)
+	@mkdir -p $(BINDIR)
 	$(LD) $(LDFLAGS) $(ENTRY_LDFLAGS) -o $@ $(OBJDIR)/win32sysinfo.o $(ENTRY_OBJ)
 
 $(BINDIR)/nteventlog.exe: $(EVLOG_OBJECTS)
+	@mkdir -p $(BINDIR)
 	$(LD) $(LDFLAGS) $(ENTRY_LDFLAGS) -o $@ $(EVLOG_OBJECTS) $(ENTRY_OBJ)
 
 $(BINDIR)/ferrule: $(OBJDIR)/ferrule.o
+	@mkdir -p $(BINDIR)
 	$(LD) $(LDFLAGS) -o $@ $<
 
 $(BINDIR)/mod_syslog: $(OBJDIR)/mod_syslog.o
+	@mkdir -p $(BINDIR)
 	$(LD) $(LDFLAGS) -o $@ $<
 
 $(BINDIR)/memsup: $(OBJDIR)/memsup.o
+	@mkdir -p $(BINDIR)
 	$(LD) $(LDFLAGS) -o $@ $<
 
 $(BINDIR)/cpu_sup: $(OBJDIR)/cpu_sup.o
+	@mkdir -p $(BINDIR)
 	$(LD) $(LDFLAGS) -o $@ $< $(CPU_SUP_LIBS) 
 
 $(OBJDIR)/%.o: %.c
+	@mkdir -p $(OBJDIR)
 	$(CC) -c -o $@ $(ALL_CFLAGS) $<
 
 $(OBJDIR)/%.o: nteventlog/%.c
+	@mkdir -p $(OBJDIR)
 	$(CC) -c -o $@ $(ALL_CFLAGS) $<
 
 $(OBJDIR)/memsup.o: memsup.h
diff --git a/lib/os_mon/mibs/Makefile b/lib/os_mon/mibs/Makefile
index cbbc337..5cb92d0 100644
--- a/lib/os_mon/mibs/Makefile
+++ b/lib/os_mon/mibs/Makefile
@@ -25,6 +25,8 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
 include ../vsn.mk
 VSN=$(OS_MON_VSN)
 
+MAKEFLAGS += -j1
+
 # ----------------------------------------------------
 # Release directory specification
 # ----------------------------------------------------
@@ -67,15 +69,19 @@ OTP_MIBDIR = $(shell if test -d ../../otp_mibs; then echo otp_mibs; \
 		      else echo sasl; fi)
 
 $(SNMP_BIN_TARGET_DIR)/OTP-REG.bin:     $(ERL_TOP)/lib/$(OTP_MIBDIR)/mibs/OTP-REG.mib
+	@mkdir -p $(SNMP_BIN_TARGET_DIR)
 	$(ERLC) -pa $(SNMP_TOOLKIT)/ebin -I $(SNMP_TOOLKIT)/priv/mibs $(SNMP_FLAGS) -o $(SNMP_BIN_TARGET_DIR) $<
 
 $(SNMP_BIN_TARGET_DIR)/OTP-TC.bin:     $(ERL_TOP)/lib/$(OTP_MIBDIR)/mibs/OTP-TC.mib
+	@mkdir -p $(SNMP_BIN_TARGET_DIR)
 	$(ERLC) -pa $(SNMP_TOOLKIT)/ebin -I $(SNMP_TOOLKIT)/priv/mibs $(SNMP_FLAGS) -o $(SNMP_BIN_TARGET_DIR) $<
 
 $(SNMP_BIN_TARGET_DIR)/OTP-MIB.bin:     $(ERL_TOP)/lib/$(OTP_MIBDIR)/mibs/OTP-MIB.mib
+	@mkdir -p $(SNMP_BIN_TARGET_DIR)
 	$(ERLC) -pa $(SNMP_TOOLKIT)/ebin -I $(SNMP_TOOLKIT)/priv/mibs $(SNMP_FLAGS) -o $(SNMP_BIN_TARGET_DIR) $<
 
 v1/%.mib.v1: %.mib
+	@mkdir -p ./v1
 	$(ERL_TOP)/lib/snmp/bin/snmp-v2tov1 -o $@ $<
 
 
diff --git a/lib/otp_mibs/mibs/Makefile b/lib/otp_mibs/mibs/Makefile
index 5e59824..f045364 100644
--- a/lib/otp_mibs/mibs/Makefile
+++ b/lib/otp_mibs/mibs/Makefile
@@ -68,6 +68,7 @@ docs:
 # ----------------------------------------------------
 
 v1/%.mib.v1: %.mib
+	@mkdir -p ./v1
 	$(ERL_TOP)/lib/snmp/bin/snmp-v2tov1 -o $@ $<
 
 # ----------------------------------------------------
diff --git a/lib/public_key/asn1/Makefile b/lib/public_key/asn1/Makefile
index 94abec0..b568ba7 100644
--- a/lib/public_key/asn1/Makefile
+++ b/lib/public_key/asn1/Makefile
@@ -26,6 +26,8 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
 include ../vsn.mk
 VSN=$(PUBLIC_KEY_VSN)
 
+MAKEFLAGS += -j1
+
 # ----------------------------------------------------
 # Release directory specification
 # ----------------------------------------------------
@@ -65,7 +67,7 @@ EBIN = ../ebin
 EXTRA_ERLC_FLAGS = 
 ERL_COMPILE_FLAGS += $(EXTRA_ERLC_FLAGS)
 
-ASN_FLAGS = -bber_bin +der +compact_bit_string +optimize +noobj +asn1config +inline
+ASN_FLAGS = -bber_bin +der +compact_bit_string +optimize +noobj +asn1config +inline -pz $(ERL_TOP)/lib/syntax_tools/ebin -pz $(ERL_TOP)/lib/asn1/ebin
 
 # ----------------------------------------------------
 # Targets
diff --git a/lib/snmp/mibs/Makefile.in b/lib/snmp/mibs/Makefile.in
index 3af74ec..8de7a53 100644
--- a/lib/snmp/mibs/Makefile.in
+++ b/lib/snmp/mibs/Makefile.in
@@ -26,6 +26,8 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
 include ../vsn.mk
 VSN = $(SNMP_VSN)
 
+MAKEFLAGS += -j1
+
 # ----------------------------------------------------
 # Configured variables
 # ----------------------------------------------------
@@ -142,10 +144,12 @@ OTP_MIBDIR = $(shell if test -d ../../otp_mibs; then echo otp_mibs; \
 debug opt: $(TARGET_FILES)
 
 $(ERL_TOP)/lib/snmp/bin/snmp-v2tov1: $(ERL_TOP)/lib/snmp/bin/snmp-v2tov1.src
+	@mkdir -p ./v1
 	$(PERL) -p -e 's?%PERL%?$(PERL)? ' < $< > $@
 	chmod 755 $@
 
 $(SNMP_BIN_TARGET_DIR)/OTP-REG.bin:	$(ERL_TOP)/lib/$(OTP_MIBDIR)/mibs/OTP-REG.mib
+	@mkdir -p $(SNMP_BIN_TARGET_DIR)
 	$(ERLC) -pa $(SNMP_TOOLKIT)/ebin -I $(SNMP_TOOLKIT)/priv/mibs $(SNMP_FLAGS) -o $(SNMP_BIN_TARGET_DIR) $<
 
 clean:
diff --git a/lib/snmp/src/compile/Makefile b/lib/snmp/src/compile/Makefile
index 627af6f..6d43103 100644
--- a/lib/snmp/src/compile/Makefile
+++ b/lib/snmp/src/compile/Makefile
@@ -69,7 +69,7 @@ ERL_COMPILE_FLAGS += -I../../include \
                      -I$(ERL_TOP)/lib/stdlib
 
 YRL_FLAGS = -o .
-
+YRL_FLAGS += -pz $(ERL_TOP)/lib/parsetools/ebin
 
 # ----------------------------------------------------
 # Targets
diff --git a/lib/ssh/src/Makefile b/lib/ssh/src/Makefile
index 42880fa..302383d 100644
--- a/lib/ssh/src/Makefile
+++ b/lib/ssh/src/Makefile
@@ -27,6 +27,8 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
 include ../vsn.mk
 VSN=$(SSH_VSN)
 
+MAKEFLAGS += -j1
+
 # ----------------------------------------------------
 # Release directory specification
 # ----------------------------------------------------
@@ -94,14 +96,14 @@ ASN_HRLS = $(ASN_MODULES:%=%.hrl)
 ASN_DBS = $(ASN_MODULES:%=%.asn1db)
 ASN_TABLES = $(ASN_MODULES:%=%.table)
 
-ASN_FLAGS = -bber_bin +der +compact_bit_string +optimize +noobj +inline
+ASN_FLAGS = -bber_bin +der +compact_bit_string +optimize +noobj +inline -pz $(ERL_TOP)/lib/syntax_tools/ebin -pz $(ERL_TOP)/lib/asn1/ebin
 
 INTERNAL_HRL_FILES = $(ASN_HRLS) ssh_auth.hrl ssh_connect.hrl ssh_transport.hrl
 
 # ----------------------------------------------------
 # FLAGS
 # ----------------------------------------------------
-ERL_COMPILE_FLAGS += -pa$(EBIN) 
+ERL_COMPILE_FLAGS += -pa$(EBIN)
 
 # ----------------------------------------------------
 # Targets
diff --git a/lib/ssl/c_src/Makefile b/lib/ssl/c_src/Makefile
index 52d9140..9b8f43a 100644
--- a/lib/ssl/c_src/Makefile
+++ b/lib/ssl/c_src/Makefile
@@ -24,3 +24,5 @@
 #
 
 include $(ERL_TOP)/make/run_make.mk
+
+MAKEFLAGS += -j1
diff --git a/lib/ssl/c_src/Makefile.in b/lib/ssl/c_src/Makefile.in
index 6e413e7..e670b77 100644
--- a/lib/ssl/c_src/Makefile.in
+++ b/lib/ssl/c_src/Makefile.in
@@ -107,7 +107,7 @@ else
 SSL_MAKEFILE =
 endif
 
-CC_R_FLAG=@CFLAG_RUNTIME_LIBRARY_PATH@
+CC_R_FLAG=
 
 ifeq ($(findstring @,$(CC_R_FLAG)),@)
 # Old erts configure used which hasn't replaced @CFLAG_RUNTIME_LIBRARY_PATH@;
diff --git a/lib/stdlib/src/Makefile b/lib/stdlib/src/Makefile
index 600303d..bd8f9d3 100644
--- a/lib/stdlib/src/Makefile
+++ b/lib/stdlib/src/Makefile
@@ -152,6 +152,8 @@ ERL_COMPILE_FLAGS += +native
 endif
 ERL_COMPILE_FLAGS += -I../include -I../../kernel/include
 
+YRL_FLAGS += -pz $(ERL_TOP)/lib/parsetools/ebin
+
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
diff --git a/lib/tools/c_src/Makefile b/lib/tools/c_src/Makefile
index 0cdc50e..6f1d382 100644
--- a/lib/tools/c_src/Makefile
+++ b/lib/tools/c_src/Makefile
@@ -4,3 +4,4 @@
 
 include $(ERL_TOP)/make/run_make.mk
 
+MAKEFLAGS += -j1
diff --git a/lib/tools/src/Makefile b/lib/tools/src/Makefile
index 360f4f8..5973455 100644
--- a/lib/tools/src/Makefile
+++ b/lib/tools/src/Makefile
@@ -77,6 +77,8 @@ APPUP_TARGET = $(EBIN)/$(APPUP_FILE)
 # ----------------------------------------------------
 ERL_COMPILE_FLAGS +=
 
+YRL_FLAGS += -pz $(ERL_TOP)/lib/parsetools/ebin
+
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
diff --git a/lib/xmerl/src/Makefile b/lib/xmerl/src/Makefile
index 7009b50..74ad350 100644
--- a/lib/xmerl/src/Makefile
+++ b/lib/xmerl/src/Makefile
@@ -127,6 +127,8 @@ ERL_COMPILE_FLAGS += \
 
 #		+bin_opt_info 
 
+YRL_FLAGS += -pz $(ERL_TOP)/lib/parsetools/ebin
+
 
 # ----------------------------------------------------
 # Targets
@@ -173,10 +175,10 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
 	sed -e 's;%VSN%;$(VSN);' $< > $@
 
 xmerl_xpath_parse.erl:	xmerl_xpath_parse.yrl
-	$(ERLC)  -o  $(ESRC) $<
+	$(ERLC) -o $(ESRC) $(YRL_FLAGS) $<
 
 xmerl_b64Bin.erl: xmerl_b64Bin.yrl
-	$(ERLC)  -o  $(ESRC) $<
+	$(ERLC) -o $(ESRC) $(YRL_FLAGS) $<
 
 xmerl_sax_parser_list.erl: xmerl_sax_parser_list.erlsrc xmerl_sax_parser_base.erlsrc
 	cat xmerl_sax_parser_list.erlsrc xmerl_sax_parser_base.erlsrc >$@
diff --git a/make/otp.mk.in b/make/otp.mk.in
index 4dd309b..3e304cc 100644
--- a/make/otp.mk.in
+++ b/make/otp.mk.in
@@ -110,9 +110,11 @@ ESRC = .
 endif
 
 $(EBIN)/%.beam: $(EGEN)/%.erl
+	@mkdir -p $(EBIN)
 	$(ERLC) $(ERL_COMPILE_FLAGS) -o$(EBIN) $<
 
 $(EBIN)/%.beam: $(ESRC)/%.erl
+	@mkdir -p $(EBIN)
 	$(ERLC) $(ERL_COMPILE_FLAGS) -o$(EBIN) $<
 
 .erl.beam:
@@ -149,9 +151,11 @@ endif
 
 
 $(SNMP_BIN_TARGET_DIR)/%.bin: %.mib
+	@mkdir -p $(SNMP_BIN_TARGET_DIR)
 	$(ERLC) -pa $(SNMP_TOOLKIT)/ebin -I $(SNMP_TOOLKIT)/priv/mibs $(SNMP_FLAGS) -o $(SNMP_BIN_TARGET_DIR) $<
 
 $(SNMP_HRL_TARGET_DIR)/%.hrl: $(SNMP_BIN_TARGET_DIR)/%.bin
+	@mkdir -p $(SNMP_HRL_TARGET_DIR)
 	$(ERLC) -pa $(SNMP_TOOLKIT)/ebin -o $(SNMP_HRL_TARGET_DIR) $<
 
 .mib.bin:
 
дизайн и разработка: Vladimir Lettiev aka crux © 2004-2005, Andrew Avramenko aka liks © 2007-2008
текущий майнтейнер: Michael Shigorin