summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorisaacs <i@izs.me>2013-01-11 10:18:07 -0800
committerisaacs <i@izs.me>2013-01-11 10:18:07 -0800
commit97db62b4d9f7de385ccbcddb70ae048b050f5c24 (patch)
treeb229a05031c68d0b2f087d6bccebf65d85b80f1d /Makefile
parent6a91eab0970a87431743c79ecb8e3efaed1796d9 (diff)
parent4fa3fd1cc0eb5a63d8b3644af5b4dc2d6cc0cc86 (diff)
downloadnodejs-97db62b4d9f7de385ccbcddb70ae048b050f5c24.tar.gz
nodejs-97db62b4d9f7de385ccbcddb70ae048b050f5c24.tar.bz2
nodejs-97db62b4d9f7de385ccbcddb70ae048b050f5c24.zip
Merge remote-tracking branch 'ry/v0.8' into master
Conflicts: AUTHORS ChangeLog Makefile src/node_version.h
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 0dde96c9a..779547bbc 100644
--- a/Makefile
+++ b/Makefile
@@ -295,7 +295,7 @@ tar: $(TARBALL)
$(BINARYTAR): release-only
rm -rf $(BINARYNAME)
rm -rf out/deps out/Release
- $(PYTHON) ./configure --prefix=/ --without-snapshot --dest-cpu=$(DESTCPU)
+ $(PYTHON) ./configure --prefix=/ --without-snapshot --dest-cpu=$(DESTCPU) $(CONFIG_FLAGS)
$(MAKE) install DESTDIR=$(BINARYNAME) V=$(V) PORTABLE=1
cp README.md $(BINARYNAME)
cp LICENSE $(BINARYNAME)