Browse Source

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
v0.10.6-release
Timothy J Fontaine 12 years ago
parent
commit
76cbd039b9
  1. 8
      Makefile

8
Makefile

@ -266,11 +266,11 @@ pkg: $(PKG)
$(PKG): release-only $(PKG): release-only
rm -rf $(PKGDIR) rm -rf $(PKGDIR)
rm -rf out/deps out/Release rm -rf out/deps out/Release
$(PYTHON) ./configure --prefix=$(PKGDIR)/32/usr/local --without-snapshot --dest-cpu=ia32 --tag=$(TAG) $(PYTHON) ./configure --without-snapshot --dest-cpu=ia32 --tag=$(TAG)
$(MAKE) install V=$(V) $(MAKE) install V=$(V) DESTDIR=$(PKGDIR)/32
rm -rf out/deps out/Release rm -rf out/deps out/Release
$(PYTHON) ./configure --prefix=$(PKGDIR)/usr/local --without-snapshot --dest-cpu=x64 --tag=$(TAG) $(PYTHON) ./configure --without-snapshot --dest-cpu=x64 --tag=$(TAG)
$(MAKE) install V=$(V) $(MAKE) install V=$(V) DESTDIR=$(PKGDIR)
SIGN="$(SIGN)" PKGDIR="$(PKGDIR)" bash tools/osx-codesign.sh SIGN="$(SIGN)" PKGDIR="$(PKGDIR)" bash tools/osx-codesign.sh
lipo $(PKGDIR)/32/usr/local/bin/node \ lipo $(PKGDIR)/32/usr/local/bin/node \
$(PKGDIR)/usr/local/bin/node \ $(PKGDIR)/usr/local/bin/node \

Loading…
Cancel
Save