Bug 1007129 - Use MOZ_APP* to define target includedir path instead of LIBRARY_NAME. r=glandium
authorIan Stakenvicius <axs@gentoo.org>
Wed, 07 May 2014 07:55:00 -0400
changeset 182305 80a904eed6edaf976d6470ebba5c7b9b3fc09d21
parent 182304 c916987d08cfdcaab60849c0f2567f5160f20610
child 182306 11a57591cedbc8bb8734e11bd34c0fd70c426a7c
push id6915
push usercbook@mozilla.com
push dateFri, 09 May 2014 12:20:22 +0000
treeherderb2g-inbound@41b4bc6970b8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1007129
milestone32.0a1
Bug 1007129 - Use MOZ_APP* to define target includedir path instead of LIBRARY_NAME. r=glandium
js/src/Makefile.in
js/src/configure.in
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -299,17 +299,17 @@ install:: $(LIBRARY_NAME).pc
 #          js/src/ds/* public headers
 #        gc/
 #          js/src/gc/* public headers
 #        mozilla/
 #          mfbt headers
 #
 
 install::
-	$(call py_action,process_install_manifest,--no-remove $(DESTDIR)$(includedir)/$(LIBRARY_NAME) $(DEPTH)/_build_manifests/install/dist_include)
+	$(call py_action,process_install_manifest,--no-remove $(DESTDIR)$(includedir) $(DEPTH)/_build_manifests/install/dist_include)
 
 #
 # END SpiderMonkey header installation
 #############################################
 
 install:: $(SCRIPTS)
 	$(SYSINSTALL) $^ $(DESTDIR)$(bindir)
 
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -4018,16 +4018,18 @@ AC_HAVE_FUNCS(localeconv)
 AC_SUBST(MOZILLA_VERSION)
 
 AC_SUBST(ac_configure_args)
 
 AC_SUBST(TOOLCHAIN_PREFIX)
 
 
 if test -n "$JS_STANDALONE"; then
+MOZ_APP_NAME="mozjs"
+MOZ_APP_VERSION="$MOZILLA_SYMBOLVERSION"
 JS_LIBRARY_NAME="mozjs-$MOZILLA_SYMBOLVERSION"
 else
 JS_LIBRARY_NAME="mozjs"
 fi
 JS_CONFIG_LIBS="$NSPR_LIBS $LIBS"
 if test -n "$GNU_CC"; then
 JS_CONFIG_MOZ_JS_LIBS='-L${libdir} -l${JS_LIBRARY_NAME}'
 else