diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2020-05-08 21:32:50 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2020-05-13 13:34:36 +0200 |
| commit | ce308d606caa658f20839cbe68387f866acac2b6 (patch) | |
| tree | 9199f46c5df1801d93559ed040626d173370f733 | |
| parent | d3942a41d98dbb2d41615c0eac4c39ff9946cd66 (diff) | |
macOS: don't hardcode LibreOffice in SDK directory, use $PRODUCTNAME
so that it will use LibreOfficeDev when not using --enable-release-build
Change-Id: I60794ababce11355659d483197ce8b0193d375b4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93817
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | scp2/source/sdkoo/sdkoo.scp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 06b0dd704f4f..c670181c65d7 100644 --- a/configure.ac +++ b/configure.ac @@ -710,7 +710,7 @@ darwin*) # macOS or iOS _os=Darwin INSTROOTBASESUFFIX=/$PRODUCTNAME_WITHOUT_SPACES.app INSTROOTCONTENTSUFFIX=/Contents - SDKDIRNAME=AC_PACKAGE_NAME${PRODUCTVERSION}_SDK + SDKDIRNAME=${PRODUCTNAME}${PRODUCTVERSION}_SDK fi # See comment above the case "$host_os" LINKFLAGSSHL="-dynamiclib -single_module" diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp index e4ff95221013..d0ebc0f6d1bc 100644 --- a/scp2/source/sdkoo/sdkoo.scp +++ b/scp2/source/sdkoo/sdkoo.scp @@ -48,7 +48,7 @@ Directory gid_Dir_Sdkoo_Sdk ParentID = PREDEFINED_PROGDIR; #endif #ifdef MACOSX - DosName = "LibreOffice${PRODUCTVERSION}_SDK"; + DosName = "${PRODUCTNAME}${PRODUCTVERSION}_SDK"; #else DosName = "sdk"; #endif |