From 76cbd039b93905df1144d5ce8625d3c35a5244cc Mon Sep 17 00:00:00 2001 From: Timothy J Fontaine Date: Thu, 2 May 2013 13:54:37 -0700 Subject: [PATCH] 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 --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index ae05f4dc71..a3532f11ba 100644 --- a/Makefile +++ b/Makefile @@ -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 \