diff --git a/Makefile.targ b/Makefile.targ index c11dcfeb..f65a5688 100644 --- a/Makefile.targ +++ b/Makefile.targ @@ -36,13 +36,14 @@ install_autoconf_32: all mkdir -p $(DESTDIR) (cd $(VER.32); \ env - PATH=$(PATH) \ - $(MAKE) $(install_PARALLEL) DESTDIR=$(DESTDIR) install) + $(MAKE) $(install_PARALLEL) $(OVERRIDES) DESTDIR=$(DESTDIR) install) install_autoconf_64: all mkdir -p $(DESTDIR) (cd $(VER.64); \ env - PATH=$(PATH) \ - $(MAKE) $(install_PARALLEL) DESTDIR=$(DESTDIR) install) + $(MAKE) $(install_PARALLEL) $(OVERRIDES.64) DESTDIR=$(DESTDIR) \ + install) $(AUTOCONF_OUT.32): $(VER.32)/configure (cd $(VER.32); \ diff --git a/node.js/Makefile b/node.js/Makefile index 7bbebc7b..007fb8b8 100644 --- a/node.js/Makefile +++ b/node.js/Makefile @@ -46,9 +46,11 @@ OVERRIDES += $(AUTOCONF_ENV) AUTOCONF_OUT = build/default/config.h +all: all_autoconf + # - platform_node_version.js is autogenerated with the current node version # - we move man pages as we want them in /usr/node/0.8/man -install: all +install: install_autoconf mkdir -p $(DESTDIR)/usr/node/$(MAJOR_VER)/node_modules ./build_require_platform_node_version.sh \ $(DESTDIR)/usr/node/$(MAJOR_VER)/bin/node \ @@ -58,4 +60,3 @@ install: all $(DESTDIR)/usr/node/$(MAJOR_VER)/ include ../Makefile.targ -include ../Makefile.targ.autoconf