Bug 1007129 - Use MOZ_APP* to define target includedir path instead of LIBRARY_NAME. r=glandium, a=sledru
authorIan Stakenvicius <axs@gentoo.org>
Wed, 07 May 2014 07:55:00 -0400
changeset 199144 ead64c649312f3936b9f8526d01f86f849116ae0
parent 199143 4ecd5fbba50167dc48ccb4bc5e96673de8e59760
child 199145 aa6f29455c250780224ea58ed843a64ae83508be
push id3624
push userasasaki@mozilla.com
push dateMon, 09 Jun 2014 21:49:01 +0000
treeherdermozilla-beta@b1a5da15899a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium, sledru
bugs1007129
milestone31.0a2
Bug 1007129 - Use MOZ_APP* to define target includedir path instead of LIBRARY_NAME. r=glandium, a=sledru
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
@@ -4099,16 +4099,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