diff options
| author | Timothy J Fontaine <tjfontaine@gmail.com> | 2013-05-02 13:54:37 -0700 |
|---|---|---|
| committer | Timothy J Fontaine <tjfontaine@gmail.com> | 2013-05-06 10:10:05 -0700 |
| commit | 76cbd039b93905df1144d5ce8625d3c35a5244cc (patch) | |
| tree | 9e68eeb47080a51e9563391694563f5de523f080 | |
| parent | 1c2b03dea5846916073efeb90f3c56db09e0dec5 (diff) | |
| download | node-76cbd039b93905df1144d5ce8625d3c35a5244cc.tar.gz | |
build: only use DESTDIR instead of PREFIX for pkg
Preserve default install prefix seen in process.config, but use DESTDIR
for installing to deliniate 32/64 versions, avoid conflicts with PREFIX
settings in config.mk
| -rw-r--r-- | Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -266,11 +266,11 @@ pkg: $(PKG) $(PKG): release-only rm -rf $(PKGDIR) rm -rf out/deps out/Release - $(PYTHON) ./configure --prefix=$(PKGDIR)/32/usr/local --without-snapshot --dest-cpu=ia32 --tag=$(TAG) - $(MAKE) install V=$(V) + $(PYTHON) ./configure --without-snapshot --dest-cpu=ia32 --tag=$(TAG) + $(MAKE) install V=$(V) DESTDIR=$(PKGDIR)/32 rm -rf out/deps out/Release - $(PYTHON) ./configure --prefix=$(PKGDIR)/usr/local --without-snapshot --dest-cpu=x64 --tag=$(TAG) - $(MAKE) install V=$(V) + $(PYTHON) ./configure --without-snapshot --dest-cpu=x64 --tag=$(TAG) + $(MAKE) install V=$(V) DESTDIR=$(PKGDIR) SIGN="$(SIGN)" PKGDIR="$(PKGDIR)" bash tools/osx-codesign.sh lipo $(PKGDIR)/32/usr/local/bin/node \ $(PKGDIR)/usr/local/bin/node \ |