build: only use DESTDIR instead of PREFIX for pkg
authorTimothy J Fontaine <tjfontaine@gmail.com>
Thu, 2 May 2013 20:54:37 +0000 (13:54 -0700)
committerTimothy J Fontaine <tjfontaine@gmail.com>
Mon, 6 May 2013 17:10:05 +0000 (10:10 -0700)
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

index ae05f4d..a3532f1 100644 (file)
--- 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 \