Bug 480680 - nsprpub/configure often gets this unwanted(!?) local modification; (Av1a) No more autoconf; r=(ted.mielczarek + wtc)
authorSerge Gautherie <sgautherie.bz@free.fr>
Sat, 21 Mar 2009 00:38:50 +0100
changeset 26436 146ea3a52cf909799d95cb44639e5e8f6cfa0707
parent 26435 38bf155ba088d5a70c9d017d871c4073debede03
child 26437 ecb3f8997a38979a44faa24de5471d56827cf0b0
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 17:57:20 +0000
bugs480680
milestone1.9.2a1pre
Bug 480680 - nsprpub/configure often gets this unwanted(!?) local modification; (Av1a) No more autoconf; r=(ted.mielczarek + wtc)
client.mk
--- a/client.mk
+++ b/client.mk
@@ -163,17 +163,16 @@ else
   OBJDIR := $(TOPSRCDIR)
   MOZ_MAKE := $(MAKE) $(MOZ_MAKE_FLAGS)
 endif
 
 endif # MOZ_BUILD_PROJECTS
 
 # 'configure' scripts generated by autoconf.
 CONFIGURES := $(TOPSRCDIR)/configure
-CONFIGURES += $(TOPSRCDIR)/nsprpub/configure
 CONFIGURES += $(TOPSRCDIR)/js/src/configure
 
 #######################################################################
 # Rules
 # 
 
 # The default rule is build
 build::
@@ -285,17 +284,17 @@ EXTRA_CONFIG_DEPS := \
 	@echo Generating $@ using autoconf
 	cd $(@D); $(AUTOCONF)
 endif
 
 CONFIG_STATUS_DEPS := \
 	$(wildcard $(CONFIGURES)) \
 	$(TOPSRCDIR)/allmakefiles.sh \
 	$(TOPSRCDIR)/.mozconfig.mk \
-	$(wildcard $(TOPSRCDIR)/directory/c-sdk/configure) \
+	$(wildcard $(TOPSRCDIR)/nsprpub/configure) \
 	$(wildcard $(TOPSRCDIR)/config/milestone.txt) \
 	$(wildcard $(TOPSRCDIR)/config/chrome-versions.sh) \
   $(wildcard $(addsuffix confvars.sh,$(wildcard $(TOPSRCDIR)/*/))) \
 	$(NULL)
 
 # configure uses the program name to determine @srcdir@. Calling it without
 #   $(TOPSRCDIR) will set @srcdir@ to "."; otherwise, it is set to the full
 #   path of $(TOPSRCDIR).