Bug 986301 - Fix --with-libxul-sdk after bug 969164. r=gps, a=NPOTB
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 21 Mar 2014 11:52:25 +0900
changeset 191228 7c71b006526e
parent 191227 383145c68477
child 191229 f8b4c3549703
push id3503
push userraliiev@mozilla.com
push dateMon, 28 Apr 2014 18:51:11 +0000
treeherdermozilla-beta@c95ac01e332e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps, NPOTB
bugs986301, 969164
milestone30.0a2
Bug 986301 - Fix --with-libxul-sdk after bug 969164. r=gps, a=NPOTB
Makefile.in
--- a/Makefile.in
+++ b/Makefile.in
@@ -36,19 +36,21 @@ else
 configure_dir = $(topsrcdir)
 endif
 
 ifndef MOZ_PROFILE_USE
 # We need to explicitly put backend.RecursiveMakeBackend here
 # otherwise the rule in rules.mk doesn't run early enough.
 libs binaries export tools:: CLOBBER $(configure_dir)/configure config.status backend.RecursiveMakeBackend
 ifndef JS_STANDALONE
+ifndef LIBXUL_SDK
 libs binaries export tools:: $(topsrcdir)/js/src/configure js/src/config.status
 endif
 endif
+endif
 
 ifdef JS_STANDALONE
 .PHONY: CLOBBER
 CLOBBER:
 else
 CLOBBER: $(topsrcdir)/CLOBBER
 	@echo 'STOP!  The CLOBBER file has changed.'
 	@echo 'Please run the build through a sanctioned build wrapper, such as'
@@ -96,21 +98,23 @@ install_manifests := bin idl include pub
 install_manifest_depends = \
   CLOBBER \
   $(configure_dir)/configure \
   config.status \
   backend.RecursiveMakeBackend \
   $(NULL)
 
 ifndef JS_STANDALONE
+ifndef LIBXUL_SDK
 install_manifest_depends += \
   $(topsrcdir)/js/src/configure \
   js/src/config.status \
   $(NULL)
 endif
+endif
 
 .PHONY: install-manifests
 install-manifests: $(addprefix install-dist-,$(install_manifests))
 
 # process_install_manifest needs to be invoked with --no-remove when building
 # js as standalone because automated builds are building nspr separately and
 # that would remove the resulting files.
 # Eventually, a standalone js build would just be able to build nspr itself,