From 5ab4471d7266931628c75148435b7aae3a22abb3 Mon Sep 17 00:00:00 2001 From: Evan Lucas Date: Tue, 11 Jul 2017 19:04:53 -0500 Subject: [PATCH] build,tools: do not force codesign prefix Allow passing the prefix in via the PKGDIR env var. This will allow us to use this same script to codesign the binary tarball. PR-URL: https://github.com/nodejs/node/pull/14179 Reviewed-By: Refael Ackermann Reviewed-By: Ben Noordhuis Reviewed-By: Myles Borins Reviewed-By: Gibson Fahnestock Reviewed-By: James M Snell --- Makefile | 3 ++- tools/osx-codesign.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 01716fc7317e82..69813e89621e38 100644 --- a/Makefile +++ b/Makefile @@ -702,7 +702,8 @@ $(PKG): release-only --release-urlbase=$(RELEASE_URLBASE) \ $(CONFIG_FLAGS) $(BUILD_RELEASE_FLAGS) $(MAKE) install V=$(V) DESTDIR=$(PKGDIR) - SIGN="$(CODESIGN_CERT)" PKGDIR="$(PKGDIR)" bash tools/osx-codesign.sh + SIGN="$(CODESIGN_CERT)" PKGDIR="$(PKGDIR)/usr/local" bash \ + tools/osx-codesign.sh cat tools/osx-pkg.pmdoc/index.xml.tmpl \ | sed -E "s/\\{nodeversion\\}/$(FULLVERSION)/g" \ | sed -E "s/\\{npmversion\\}/$(NPMVERSION)/g" \ diff --git a/tools/osx-codesign.sh b/tools/osx-codesign.sh index 5c2d1aff34d8fd..6a954c737fa4c5 100644 --- a/tools/osx-codesign.sh +++ b/tools/osx-codesign.sh @@ -8,4 +8,4 @@ if [ "X$SIGN" == "X" ]; then exit 0 fi -codesign -s "$SIGN" "$PKGDIR"/usr/local/bin/node +codesign -s "$SIGN" "$PKGDIR"/bin/node