diff options
| author | Tim Taubert <ttaubert@mozilla.com> | 2016-11-04 08:06:00 +0100 |
|---|---|---|
| committer | Tim Taubert <ttaubert@mozilla.com> | 2016-11-04 08:06:00 +0100 |
| commit | 405290410e43f58aa2011cb44d8202d76751cb31 (patch) | |
| tree | 326f120774d357860b189ad632a6d26bb653ac4a /Makefile | |
| parent | 8fce37ee6ee6c3ef20af8444deb314e95616eff0 (diff) | |
| download | nss-hg-405290410e43f58aa2011cb44d8202d76751cb31.tar.gz | |
Bug 1312439 - Don't determine $OBJDIR using "make platform" r=franziskus
Differential Revision: https://nss-review.dev.mozaws.net/D18
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -126,7 +126,7 @@ else NSPR_PREFIX = $$(topsrcdir)/../dist/$(OBJDIR_NAME) endif -ifndef NSS_GYP +ifndef NSS_GYP_PREFIX $(NSPR_CONFIG_STATUS): $(NSPR_CONFIGURE) mkdir -p $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) cd $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) ; \ @@ -140,7 +140,7 @@ $(NSPR_CONFIG_STATUS): $(NSPR_CONFIGURE) cd $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) ; \ $(NSPR_CONFIGURE_ENV) sh ../configure \ $(NSPR_CONFIGURE_OPTS) \ - --prefix='$(NSPR_PREFIX)' + --prefix='$(NSS_GYP_PREFIX)' endif build_nspr: $(NSPR_CONFIG_STATUS) |