Navigation Menu

Skip to content

Commit

Permalink
OS-1388 illumos-extra node build failure
Browse files Browse the repository at this point in the history
  • Loading branch information
jjelinek committed Jul 16, 2012
1 parent 15f18d0 commit 0d21b66
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
5 changes: 3 additions & 2 deletions Makefile.targ
Expand Up @@ -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); \
Expand Down
5 changes: 3 additions & 2 deletions node.js/Makefile
Expand Up @@ -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 \
Expand All @@ -58,4 +60,3 @@ install: all
$(DESTDIR)/usr/node/$(MAJOR_VER)/

include ../Makefile.targ
include ../Makefile.targ.autoconf

0 comments on commit 0d21b66

Please sign in to comment.