Bug 1422930 - Fix SpiderMonkey includedir installs. r=glandium, a=jcristau
authorPhilip Chimento <philip.chimento@gmail.com>
Mon, 14 May 2018 10:29:00 -0400
changeset 802183 8e016d7b01bbafb36d5198273d8f4c801782c108
parent 802182 31d4880fde318a25abb7dc5b99a0aaafc63af3bb
child 802184 7aec8de1c9d5fb9b5d25481df1e38242f4df5ea6
push id111850
push userbmo:tom@mozilla.com
push dateThu, 31 May 2018 16:41:37 +0000
reviewersglandium, jcristau
bugs1422930
milestone60.0.2
Bug 1422930 - Fix SpiderMonkey includedir installs. r=glandium, a=jcristau Somehow the header files were being installed directly into $prefix/include, rather than $prefix/include/mozjs-60. Something else changed somewhere that affected this, since this code was the same in older mozjs versions, but this seems the most logical place to fix it.
js/src/build/Makefile.in
--- a/js/src/build/Makefile.in
+++ b/js/src/build/Makefile.in
@@ -37,44 +37,44 @@ endif
 	cp $^ $@
 
 # Install versioned file, for parallel installability in Linux distributions
 install:: $(LIBRARY_NAME).pc
 	cp $^ $(JS_LIBRARY_NAME).pc
 	$(SYSINSTALL) $(JS_LIBRARY_NAME).pc $(DESTDIR)$(libdir)/pkgconfig
 
 install:: ../js-config.h
-	$(SYSINSTALL) $^ $(DESTDIR)$(includedir)
+	$(SYSINSTALL) $^ $(DESTDIR)$(includedir)/$(JS_LIBRARY_NAME)
 
 ######################################################
 # BEGIN SpiderMonkey header installation
 #
 # Mozilla/Gecko/Firefox mostly doesn't concern itself with defining a sensible
 # install target, because it's shipping primarily packaged builds.  And even if
 # it did, those builds wouldn't really have reason to include header files.  So
 # we have to install public headers ourselves, rather than using something from
 # config/rules.mk or similar.
 #
 # The overall directory structure of the installed headers looks like so:
 #
 #   $(includedir)/
-#      $(LIBRARY_NAME)/
+#      $(JS_LIBRARY_NAME)/
 #        jsapi.h, jspubtd.h, etc. (all of EXPORTS)
 #        js/
 #          js/public/* headers (all are public)
 #        ds/
 #          js/src/ds/* public headers
 #        gc/
 #          js/src/gc/* public headers
 #        mozilla/
 #          mfbt headers
 #
 
 install::
-	$(call py_action,process_install_manifest,--track install_dist_include.track --no-symlinks $(DESTDIR)$(includedir) $(DEPTH)/_build_manifests/install/dist_include)
+	$(call py_action,process_install_manifest,--track install_dist_include.track --no-symlinks $(DESTDIR)$(includedir)/$(JS_LIBRARY_NAME) $(DEPTH)/_build_manifests/install/dist_include)
 
 #
 # END SpiderMonkey header installation
 #############################################
 
 # Install versioned script, for parallel installability in Linux distributions
 install:: js-config
 	cp $^ js$(MOZJS_MAJOR_VERSION)-config