Bug 1007129 - Use MOZ_APP* to define target includedir path instead of LIBRARY_NAME. r=glandium

js/src/Makefile.in

@@ -304,7 +304,7 @@ install:: $(LIBRARY_NAME).pc
 #
 
 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

js/src/configure.in

@@ -4023,6 +4023,8 @@ 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"