Adapt CustomTarget_odk/build-examples to macOS

Change-Id: Ib64d5b5fa1bf13a484adb296b969d1b96387f0c6

config_host.mk.in

@@ -280,6 +280,7 @@ export INSTALL_NAME_TOOL=@INSTALL_NAME_TOOL@
 export INSTDIR=@INSTDIR@
 export INSTDIR_FOR_BUILD=@INSTDIR_FOR_BUILD@
 export INSTROOT=@INSTROOT@
+export INSTROOTBASE=@INSTROOTBASE@
 export INSTROOT_FOR_BUILD=@INSTROOT_FOR_BUILD@
 export IWYU_PATH=@IWYU_PATH@
 export JAVACOMPILER=@JAVACOMPILER@

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)

odk/CustomTarget_build-examples.mk

@@ -107,7 +107,7 @@ $(call gb_CustomTarget_get_workdir,odk/build-examples)/setsdkenv: \
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1)
 	sed -e 's!@OO_SDK_NAME@!sdk!' \
         -e 's!@OO_SDK_HOME@!$(INSTDIR)/$(SDKDIRNAME)!' \
-        -e 's!@OFFICE_HOME@!$(INSTDIR)!' -e 's!@OO_SDK_MAKE_HOME@!!' \
+        -e 's!@OFFICE_HOME@!$(INSTROOTBASE)!' -e 's!@OO_SDK_MAKE_HOME@!!' \
         -e 's!@OO_SDK_ZIP_HOME@!!' -e 's!@OO_SDK_CAT_HOME@!!' \
         -e 's!@OO_SDK_SED_HOME@!!' -e 's!@OO_SDK_CPP_HOME@!!' \
         -e 's!@OO_SDK_JAVA_HOME@!$(JAVA_HOME)!' \

odk/Module_odk.mk

@@ -56,7 +56,7 @@ $(eval $(call gb_Module_add_check_targets,odk,\
 	CustomTarget_check \
 ))
 
-ifeq ($(OS),LINUX)
+ifneq ($(filter $(OS),LINUX MACOSX),)
 $(eval $(call gb_Module_add_subsequentcheck_targets,odk, \
     CustomTarget_build-examples \
 ))