diff options
| author | Wolfgang Schupp <w.schupp@a1.net> | 2015-06-01 13:01:55 +0200 |
|---|---|---|
| committer | Wolfgang Schupp <w.schupp@a1.net> | 2015-06-01 13:01:55 +0200 |
| commit | 65cb85cc3eb8c3f9891addd729ab41821aa93922 (patch) | |
| tree | 256747bb933aaf4b70cf1a4ef620885e360ac537 /configure.ac | |
| parent | cdd0feeda8898730ce1ebc78420b2583daf5f6b6 (diff) | |
| parent | d270b64c5371ac79620e0f7ce464023f13d90327 (diff) | |
Merge pull request #7192 from wsnipex/linux-addon-libpath
[binary addons] linux: use the same install paths as kodi core
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 5dcc3bef2b..8c1e41221d 100644 --- a/configure.ac +++ b/configure.ac @@ -119,6 +119,7 @@ AC_DEFUN([XB_PUSH_FLAGS], [ # version can be overridden by setting the following as ENV vars when running configure APP_NAME=${APP_NAME-$(${AWK} '/APP_NAME/ {print $2}' version.txt)} APP_NAME_LC=$(echo $APP_NAME | ${AWK} '{print tolower($0)}') +APP_NAME_UC=$(echo $APP_NAME | ${AWK} '{print toupper($0)}') APP_VERSION_MAJOR=${APP_VERSION_MAJOR-$(${AWK} '/VERSION_MAJOR/ {print $2}' version.txt)} APP_VERSION_MINOR=${APP_VERSION_MINOR-$(${AWK} '/VERSION_MINOR/ {print $2}' version.txt)} APP_VERSION_TAG=${APP_VERSION_TAG-$(${AWK} '/VERSION_TAG/ {print $2}' version.txt)} @@ -134,6 +135,7 @@ if test "$APP_NAME" != "" && test "$APP_VERSION_MAJOR" != "" && test "$APP_VERSI AC_SUBST(APP_NAME) AC_SUBST(APP_NAME_LC) + AC_SUBST(APP_NAME_UC) AC_SUBST(APP_VERSION) AC_SUBST(APP_VERSION_MAJOR) AC_SUBST(APP_VERSION_MINOR) @@ -2560,8 +2562,12 @@ if echo "$libdir" | grep -q '${exec_prefix}'; then exec_prefix=${prefix} fi fi -eval "APP_LIBDIR=${libdir}" -AC_SUBST(APP_LIBDIR) +eval "APP_PREFIX=${prefix}" +eval "APP_LIB_DIR=${libdir}/${APP_NAME_LC}" +eval "APP_INCLUDE_DIR=${includedir}/${APP_NAME_LC}" +AC_SUBST(APP_PREFIX) +AC_SUBST(APP_LIB_DIR) +AC_SUBST(APP_INCLUDE_DIR) # Line below is used so we can use AM_INIT_AUTOMAKE. The corresponding # .dummy.am does nothing. |