Taken from https://bug1339931.bmoattachments.org/attachment.cgi?id=8837771. # HG changeset patch # Parent 4732a0e5d22bc7e5c1f1ace7a182d537d9cc2c6a Add major version to shell and js-config filenames. Author: Rico Tzschichholz <ricotz@ubuntu.com> Forwarded: no Last-Update: 2014-10-29 --- diff --git a/js/src/configure b/js/src/configure --- a/js/src/configure +++ b/js/src/configure @@ -1696,8 +1696,13 @@ MOZJS_PATCH_VERSION=`echo $MOZILLA_VERSION | sed "s|^[0-9]*\.[0-9]*[^0-9]*||"` IS_ALPHA=`echo $MOZILLA_VERSION | grep '[ab]'` +if test -n "$JS_STANDALONE"; then +JS_SHELL_NAME=js$MOZJS_MAJOR_VERSION +JS_CONFIG_NAME=js$MOZJS_MAJOR_VERSION-config +else JS_SHELL_NAME=js JS_CONFIG_NAME=js-config +fi if test -n "$IS_ALPHA"; then diff --git a/js/src/configure.in b/js/src/configure.in --- a/js/src/configure.in +++ b/js/src/configure.in @@ -234,16 +234,13 @@ MOZJS_MINOR_VERSION=`echo $MOZILLA_VERSI MOZJS_PATCH_VERSION=`echo $MOZILLA_VERSION | sed "s|^[0-9]*\.[0-9]*[^0-9]*||"` IS_ALPHA=`echo $MOZILLA_VERSION | grep '[ab]'` -dnl XXX in a temporary bid to avoid developer anger at renaming files -dnl XXX before "js" symlinks exist, don't change names. -dnl -dnl if test -n "$JS_STANDALONE"; then -dnl JS_SHELL_NAME=js$MOZJS_MAJOR_VERSION -dnl JS_CONFIG_NAME=js$MOZJS_MAJOR_VERSION-config -dnl else +if test -n "$JS_STANDALONE"; then +JS_SHELL_NAME=js$MOZJS_MAJOR_VERSION +JS_CONFIG_NAME=js$MOZJS_MAJOR_VERSION-config +else JS_SHELL_NAME=js JS_CONFIG_NAME=js-config -dnl fi +fi changequote([,]) if test -n "$IS_ALPHA"; then diff -r 80a9e64d75f5 js/src/Makefile.in --- a/js/src/Makefile.in Wed Jun 25 15:11:42 2014 +0200 +++ b/js/src/Makefile.in Sat Jul 05 14:08:38 2014 +0200 @@ -273,6 +273,9 @@ SCRIPTS = $(JS_CONFIG_NAME) SDK_BINARY = $(JS_CONFIG_NAME) +$(JS_CONFIG_NAME): js-config + cp $^ $@ + $(JS_LIBRARY_NAME).pc: js.pc cp $^ $@