Bug 986301 - Fix --with-libxul-sdk after bug 969164. r=gps
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 21 Mar 2014 11:52:25 +0900
changeset 174916 289dd78bae4d6baeec505403768ef3bc0be0d029
parent 174851 9f635bf9ee9cfed23f70514f9440d533b4fcf863
child 174917 8629b33918d43c9cc404c4e4726d7b2c162ec059
push id41390
push userphilringnalda@gmail.com
push dateSun, 23 Mar 2014 00:51:24 +0000
treeherdermozilla-inbound@c3b840de1f7b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs986301, 969164
milestone31.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 986301 - Fix --with-libxul-sdk after bug 969164. r=gps
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,