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:19:08 -0700 |
| commit | 5037f9a5f4f899381c6517ae84de6be5737dee36 (patch) | |
| tree | 8cb8b9b496472d1238a5e8e5fd4e73d92fa543b1 /Makefile | |
| parent | fb9d66bceb6d3d6b0d90cbfaeab650e82e9e6db5 (diff) | |
| download | android-node-v8-5037f9a5f4f899381c6517ae84de6be5737dee36.tar.gz android-node-v8-5037f9a5f4f899381c6517ae84de6be5737dee36.tar.bz2 android-node-v8-5037f9a5f4f899381c6517ae84de6be5737dee36.zip | |
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
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -267,17 +267,17 @@ pkg: $(PKG) $(PKG): release-only rm -rf $(PKGDIR) rm -rf out/deps out/Release - $(PYTHON) ./configure --prefix=$(PKGDIR)/32$(PREFIX) --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)$(PREFIX) --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$(PREFIX)/bin/node \ - $(PKGDIR)$(PREFIX)/bin/node \ - -output $(PKGDIR)$(PREFIX)/bin/node-universal \ + lipo $(PKGDIR)/32/usr/local/bin/node \ + $(PKGDIR)/usr/local/bin/node \ + -output $(PKGDIR)/usr/local/bin/node-universal \ -create - mv $(PKGDIR)$(PREFIX)/bin/node-universal $(PKGDIR)$(PREFIX)/bin/node + mv $(PKGDIR)/usr/local/bin/node-universal $(PKGDIR)/usr/local/bin/node rm -rf $(PKGDIR)/32 $(packagemaker) \ --id "org.nodejs.Node" \ |