From 525bd17ff257863226119e310fa69791aeb59d8a Mon Sep 17 00:00:00 2001
From: Petr Mladek <pmladek@suse.cz>
Date: Mon, 11 Jun 2012 18:16:08 +0200
Subject: correctly set icon names in desktop files

config_host.mk defines even empty UNIXWRAPPERNAME variable now.
Hence, 'UNIXWRAPPERNAME *=' newer assign the default value.

Change-Id: I2c782bdf79eddffa2451c5462106519479db7431
---
 sysui/desktop/productversion.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'sysui')

diff --git a/sysui/desktop/productversion.mk b/sysui/desktop/productversion.mk
index 5a186bca51bf..51dbfdb049ef 100755
--- a/sysui/desktop/productversion.mk
+++ b/sysui/desktop/productversion.mk
@@ -57,7 +57,9 @@ ICONVERSION = $(PRODUCTVERSIONSHORT:s/.//g)
 # the default values get replaced by make_installer.pl at (core0x) packaging time;
 # another wrapper name can be forced by --with-unix-wrapper configure option
 # which is need by other distributors, see http://www.openoffice.org/issues/show_bug.cgi?id=75366
-UNIXWRAPPERNAME *= '$${{UNIXPRODUCTNAME}}$${{BRANDPACKAGEVERSION}}'
+.IF "$(UNIXWRAPPERNAME)" == ""
+UNIXWRAPPERNAME = '$${{UNIXPRODUCTNAME}}$${{BRANDPACKAGEVERSION}}'
+.ENDIF
 
 PRODUCTNAME.libreoffice = LibreOffice
 PRODUCTVERSION.libreoffice = $(PRODUCTVERSION)
-- 
cgit v1.2.3