Bug 463339. Have js/src use symlinks when installing in dist. r=bsmedberg,a=sayrer

config/js/Makefile.in

@@ -55,10 +55,12 @@ include $(topsrcdir)/config/rules.mk
 # libdir, and includedir, so that the 'make install' will put things
 # mostly in the right places.  The install-runtime-libs target takes
 # care of getting the needed libraries into the 'bin' directory as
-# well as the 'lib' directory.
+# well as the 'lib' directory.  Clearing NSDISTMODE= ensures that we
+# get symlinks (the proper in-tree build behavior), not copies (the
+# default GNU behavior).
 export::
-	$(MAKE) -C $(JS_OBJDIR) install
-	$(MAKE) -C $(JS_OBJDIR) install-runtime-libs libdir=$(DIST)/bin
+	$(MAKE) -C $(JS_OBJDIR) NSDISTMODE= install
+	$(MAKE) -C $(JS_OBJDIR) NSDISTMODE= install-runtime-libs libdir=$(DIST)/bin
 	$(INSTALL) $(IFLAGS2) $(JS_CONFIG) $(SDK_BIN_DIR)
 
 check::

js/src/Makefile.in

@@ -45,6 +45,11 @@ DIRS		= config
 
 include $(DEPTH)/config/autoconf.mk
 
+# This is the appropriate behavior for GNU-style 'make install'.  For
+# Mozilla in-tree behavior, leaving NSDISTMODE unset is the right
+# thing; config/js/Makefile.in takes care of that.
+NSDISTMODE	= copy
+
 MODULE		= js
 LIBRARY_NAME	= mozjs
 GRE_MODULE	= 1
@@ -616,10 +621,10 @@ js-config: js-config.in Makefile $(DEPTH)/config/autoconf.mk $(topsrcdir)/config
 SCRIPTS = js-config
 
 install:: $(INSTALLED_HEADERS)
-	$(SYSINSTALL) $(IFLAGS1) $^ $(includedir)/$(MODULE)
+	$(INSTALL) $(IFLAGS1) $^ $(includedir)/$(MODULE)
 
 install:: $(SCRIPTS) $(PROGRAM)
-	$(SYSINSTALL) $(IFLAGS2) $^ $(bindir)
+	$(INSTALL) $(IFLAGS2) $^ $(bindir)
 
 # The Mozilla top-level makefiles use install-runtime-libs directly to
 # place an additional copy of the libraries in the 'dist/bin'
@@ -627,13 +632,13 @@ install:: $(SCRIPTS) $(PROGRAM)
 install:: install-runtime-libs
 install-runtime-libs:: $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY)
 ifneq (,$(LIBRARY))
-	$(SYSINSTALL) $(IFLAGS1) $(LIBRARY) $(libdir)
+	$(INSTALL) $(IFLAGS1) $(LIBRARY) $(libdir)
 endif
 ifneq (,$(SHARED_LIBRARY))
-	$(SYSINSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(libdir)
+	$(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(libdir)
 endif
 ifneq (,$(IMPORT_LIBRARY))
-	$(SYSINSTALL) $(IFLAGS2) $(IMPORT_LIBRARY) $(libdir)
+	$(INSTALL) $(IFLAGS2) $(IMPORT_LIBRARY) $(libdir)
 endif
 
 # Extra dependancies and rules for auto-generated headers