[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - configure.ac

[Miklos Vajna]

 configure.ac |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 8460fac0d15dce637ca84af3bfb8bb8972105be1
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Nov 12 09:47:58 2015 +0100

    configure: avoid empty PRODUCTNAME when AC_PACKAGE_NAME has to be quoted
    
    E.g. when AC_PACKAGE_NAME contains spaces, PRODUCTNAME was set to empty.
    
    (cherry picked from commit ef122d992635acb3b1e41ed5f89431d0e17f6cf6)
    
    Conflicts:
    	configure.ac
    
    Change-Id: Ie53ad1b770e54eeb03513fa2a7cfc2f4ebe65a2b

diff --git a/configure.ac b/configure.ac
index 16f224c..af48c21 100644
--- a/configure.ac
+++ b/configure.ac
@@ -114,10 +114,9 @@ dnl ===================================================================
 AC_CANONICAL_HOST
 
 AC_MSG_CHECKING([for product name])
+PRODUCTNAME="AC_PACKAGE_NAME"
 if test "$enable_release_build" = "" -o "$enable_release_build" = "no"; then
-    PRODUCTNAME=AC_PACKAGE_NAME"Dev"
-else
-    PRODUCTNAME="AC_PACKAGE_NAME"
+    PRODUCTNAME="${PRODUCTNAME}Dev"
 fi
 AC_MSG_RESULT([$PRODUCTNAME])
 AC_SUBST(PRODUCTNAME)