diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 93896d73495f..8a825d23237e 100644 --- a/configure.ac +++ b/configure.ac @@ -622,7 +622,8 @@ DLLPOST=".so" LINKFLAGSNOUNDEFS="-Wl,-z,defs" -INSTROOTSUFFIX= +INSTROOTBASESUFFIX= +INSTROOTCONTENTSUFFIX= SDKDIRNAME=sdk case "$host_os" in @@ -742,7 +743,8 @@ darwin*) # Mac OS X or iOS mac_sanitize_path AC_MSG_NOTICE([sanitized the PATH to $PATH]) fi - INSTROOTSUFFIX=/$PRODUCTNAME_WITHOUT_SPACES.app/Contents + INSTROOTBASESUFFIX=/$PRODUCTNAME_WITHOUT_SPACES.app + INSTROOTCONTENTSUFFIX=/Contents SDKDIRNAME=AC_PACKAGE_NAME${PRODUCTVERSION}_SDK fi enable_systray=no @@ -4492,7 +4494,8 @@ AC_SUBST(ENABLE_HEADLESS) WORKDIR="${BUILDDIR}/workdir" INSTDIR="${BUILDDIR}/instdir" -INSTROOT="${INSTDIR}${INSTROOTSUFFIX}" +INSTROOTBASE=${INSTDIR}${INSTROOTBASESUFFIX} +INSTROOT=${INSTROOTBASE}${INSTROOTCONTENTSUFFIX} SOLARINC="-I. -I$SRC_ROOT/include $SOLARINC" AC_SUBST(COM) AC_SUBST(CPUNAME) @@ -4502,6 +4505,7 @@ AC_SUBST(EPM_FLAGS) AC_SUBST(USING_X11) AC_SUBST([INSTDIR]) AC_SUBST([INSTROOT]) +AC_SUBST([INSTROOTBASE]) AC_SUBST(OS) AC_SUBST(P_SEP) AC_SUBST(WORKDIR) |