gmake 3.80 bustage fix for bug 488175 r=bsmedberg
authorNeil Rashbrook <neil@parkwaycc.co.uk>
Tue, 19 May 2009 16:08:15 +0100
changeset 28585 eeb44ecd8038443d76aaf6a43ee8b5d5268a49f4
parent 28584 7255df34c791f5f1c1d959b659b019e029955e25
child 28586 e4cef2105e3e742e292d7c0e160dd67e0d83745f
push idunknown
push userunknown
push dateunknown
reviewersbsmedberg
bugs488175
milestone1.9.2a1pre
gmake 3.80 bustage fix for bug 488175 r=bsmedberg
config/rules.mk
js/src/config/rules.mk
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -1570,29 +1570,30 @@ endif
 ifneq ($(XPI_NAME),)
 $(FINAL_TARGET):
 	$(NSINSTALL) -D $@
 
 export:: $(FINAL_TARGET)
 endif
 
 ifndef NO_DIST_INSTALL
-
 ifneq (,$(EXPORTS))
 export:: $(EXPORTS)
 	$(INSTALL) $(IFLAGS1) $^ $(DIST)/include
 endif
+endif # NO_DIST_INSTALL
 
 define EXPORT_NAMESPACE_RULE
+ifndef NO_DIST_INSTALL
 export:: $(EXPORTS_$(namespace))
 	$(INSTALL) $(IFLAGS1) $$^ $(DIST)/include/$(namespace)
+endif # NO_DIST_INSTALL
 endef
 
 $(foreach namespace,$(EXPORTS_NAMESPACES),$(eval $(EXPORT_NAMESPACE_RULE)))
-endif # NO_DIST_INSTALL
 
 ################################################################################
 # Copy each element of PREF_JS_EXPORTS
 
 ifdef GRE_MODULE
 PREF_DIR = greprefs
 else
 ifneq (,$(XPI_NAME)$(LIBXUL_SDK))
--- a/js/src/config/rules.mk
+++ b/js/src/config/rules.mk
@@ -1570,29 +1570,30 @@ endif
 ifneq ($(XPI_NAME),)
 $(FINAL_TARGET):
 	$(NSINSTALL) -D $@
 
 export:: $(FINAL_TARGET)
 endif
 
 ifndef NO_DIST_INSTALL
-
 ifneq (,$(EXPORTS))
 export:: $(EXPORTS)
 	$(INSTALL) $(IFLAGS1) $^ $(DIST)/include
 endif
+endif # NO_DIST_INSTALL
 
 define EXPORT_NAMESPACE_RULE
+ifndef NO_DIST_INSTALL
 export:: $(EXPORTS_$(namespace))
 	$(INSTALL) $(IFLAGS1) $$^ $(DIST)/include/$(namespace)
+endif # NO_DIST_INSTALL
 endef
 
 $(foreach namespace,$(EXPORTS_NAMESPACES),$(eval $(EXPORT_NAMESPACE_RULE)))
-endif # NO_DIST_INSTALL
 
 ################################################################################
 # Copy each element of PREF_JS_EXPORTS
 
 ifdef GRE_MODULE
 PREF_DIR = greprefs
 else
 ifneq (,$(XPI_NAME)$(LIBXUL_SDK))