diff options
| author | Petr Mladek <pmladek@suse.cz> | 2011-12-20 19:39:57 +0100 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2011-12-20 19:47:48 +0100 |
| commit | 9d94cd46ed8921ac6a459c125be3edad57f04a4e (patch) | |
| tree | 025e744daf2319a73430593a264b200e57dd9094 /sysui | |
| parent | ec9230598eaa507a4e8971f20d893169c846c9d7 (diff) | |
set correct icon names in desktop files
also use icon names *3.5* instead of *35*; this version is used on another
locations as well; it allows to reuse the UNIXBASISROOTNAME variable that
is substituted by the installer
Diffstat (limited to 'sysui')
| -rwxr-xr-x | sysui/desktop/productversion.mk | 6 | ||||
| -rwxr-xr-x | sysui/desktop/share/makefile.mk | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sysui/desktop/productversion.mk b/sysui/desktop/productversion.mk index cc790f86ae0e..398241d55a8f 100755 --- a/sysui/desktop/productversion.mk +++ b/sysui/desktop/productversion.mk @@ -63,18 +63,18 @@ PRODUCTVERSION.libreoffice = $(PRODUCTVERSION) PRODUCTVERSIONSHORT.libreoffice = $(PRODUCTVERSIONSHORT) PKGVERSION.libreoffice = $(PKGVERSION) UNIXFILENAME.libreoffice = $(PRODUCTNAME.libreoffice:l)$(PRODUCTVERSION.libreoffice) -ICONPREFIX.libreoffice = $(UNIXFILENAME.libreoffice:s/.//g) +ICONPREFIX.libreoffice = $(UNIXFILENAME.libreoffice) PRODUCTNAME.lodev = LibreOfficeDev PRODUCTVERSION.lodev = $(PRODUCTVERSION) PRODUCTVERSIONSHORT.lodev = $(PRODUCTVERSIONSHORT) PKGVERSION.lodev = $(PKGVERSION) UNIXFILENAME.lodev = lodev$(PRODUCTVERSION.lodev) -ICONPREFIX.lodev = $(UNIXFILENAME.lodev:s/.//g) +ICONPREFIX.lodev = $(UNIXFILENAME.lodev) PRODUCTNAME.oxygenoffice = OxygenOffice PRODUCTVERSION.oxygenoffice = $(PRODUCTVERSION) PRODUCTVERSIONSHORT.oxygenoffice = $(PRODUCTVERSIONSHORT) PKGVERSION.oxygenoffice = $(PKGVERSION) UNIXFILENAME.oxygenoffice = $(PRODUCTNAME.oxygenoffice:l)$(PRODUCTVERSION.oxygenoffice) -ICONPREFIX.oxygenoffice = $(UNIXFILENAME.oxygenoffice:s/.//g) +ICONPREFIX.oxygenoffice = $(UNIXFILENAME.oxygenoffice) diff --git a/sysui/desktop/share/makefile.mk b/sysui/desktop/share/makefile.mk index 88954ae3f58a..f6a34b1792f0 100755 --- a/sysui/desktop/share/makefile.mk +++ b/sysui/desktop/share/makefile.mk @@ -150,7 +150,7 @@ $(LAUNCHERFLAGFILE) : $(LAUNCHERDEPN) @@-$(MKDIRHIER) $(@:db).$(INPATH).$(@:f) @echo Creating desktop entries for $(@:f) .. @echo --------------------------------- - @$(PERL) brand.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -u $(UNIXWRAPPERNAME) --iconprefix '$(ICONPREFIX.$(@:d:d:f))-' $< $(@:db).$(INPATH).$(@:f) + @$(PERL) brand.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -u $(UNIXWRAPPERNAME) --iconprefix '$${{UNIXBASISROOTNAME}}-' $< $(@:db).$(INPATH).$(@:f) @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "Name" $(ULFDIR)$/launcher_name.ulf @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "Comment" $(ULFDIR)$/launcher_comment.ulf @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "GenericName" $(ULFDIR)$/launcher_genericname.ulf |