Skip to content
This repository was archived by the owner on Apr 22, 2023. It is now read-only.

Commit 5037f9a

Browse files
committed
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
1 parent fb9d66b commit 5037f9a

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

Makefile

+8-8
Original file line numberDiff line numberDiff line change
@@ -267,17 +267,17 @@ pkg: $(PKG)
267267
$(PKG): release-only
268268
rm -rf $(PKGDIR)
269269
rm -rf out/deps out/Release
270-
$(PYTHON) ./configure --prefix=$(PKGDIR)/32$(PREFIX) --without-snapshot --dest-cpu=ia32 --tag=$(TAG)
271-
$(MAKE) install V=$(V)
270+
$(PYTHON) ./configure --without-snapshot --dest-cpu=ia32 --tag=$(TAG)
271+
$(MAKE) install V=$(V) DESTDIR=$(PKGDIR)/32
272272
rm -rf out/deps out/Release
273-
$(PYTHON) ./configure --prefix=$(PKGDIR)$(PREFIX) --without-snapshot --dest-cpu=x64 --tag=$(TAG)
274-
$(MAKE) install V=$(V)
273+
$(PYTHON) ./configure --without-snapshot --dest-cpu=x64 --tag=$(TAG)
274+
$(MAKE) install V=$(V) DESTDIR=$(PKGDIR)
275275
SIGN="$(SIGN)" PKGDIR="$(PKGDIR)" bash tools/osx-codesign.sh
276-
lipo $(PKGDIR)/32$(PREFIX)/bin/node \
277-
$(PKGDIR)$(PREFIX)/bin/node \
278-
-output $(PKGDIR)$(PREFIX)/bin/node-universal \
276+
lipo $(PKGDIR)/32/usr/local/bin/node \
277+
$(PKGDIR)/usr/local/bin/node \
278+
-output $(PKGDIR)/usr/local/bin/node-universal \
279279
-create
280-
mv $(PKGDIR)$(PREFIX)/bin/node-universal $(PKGDIR)$(PREFIX)/bin/node
280+
mv $(PKGDIR)/usr/local/bin/node-universal $(PKGDIR)/usr/local/bin/node
281281
rm -rf $(PKGDIR)/32
282282
$(packagemaker) \
283283
--id "org.nodejs.Node" \

0 commit comments

Comments
 (0)