OSX issues with space in product name

Change-Id: I0155372c8e5cd0eb91bfbea304190502cbf32e3c

configure.ac

@@ -667,7 +667,8 @@ darwin*) # Mac OS X or iOS
         test_cups=no
     else
         _os=Darwin
-        INSTROOTSUFFIX=/$PRODUCTNAME.app/Contents
+        ONEWORDPRODUCTNAME=`echo "${PRODUCTNAME// /}"`
+        INSTROOTSUFFIX=/$ONEWORDPRODUCTNAME.app/Contents
         SDKDIRNAME=AC_PACKAGE_NAME${PRODUCTVERSION}_SDK
     fi
     enable_systray=no
@@ -12454,7 +12455,7 @@ else
 fi
 AC_SUBST(WITH_COMPAT_OOWRAPPERS)
 
-INSTALLDIRNAME=`echo AC_PACKAGE_NAME | $AWK '{print tolower($0)}'`
+INSTALLDIRNAME=`echo AC_PACKAGE_NAME | $AWK '{gsub(" ", "", $0);print tolower($0)}'`
 AC_MSG_CHECKING([for install dirname])
 if test -n "$with_install_dirname" -a "$with_install_dirname" != "no" -a "$with_install_dirname" != "yes"; then
     INSTALLDIRNAME="$with_install_dirname"

scp2/source/ooo/directory_ooo_macosx.scp

@@ -21,7 +21,7 @@
 #ifdef MACOSX
 Directory gid_Dir_Bundle
     ParentID = PD_PROGDIR;
-    HostName = "%PRODUCTNAME.app";
+    HostName = "%ONEWORDPRODUCTNAME.app";
 End
 
 Directory gid_Dir_Bundle_Contents