diff options
| author |   Carsten Lohrke <carlo@gentoo.org> | 2005-05-26 15:13:36 +0000 |
|---|---|---|
| committer | Carsten Lohrke <carlo@gentoo.org> | 2005-05-26 15:13:36 +0000 |
| commit | f636c7e0364cbcf10e25aae216bbf2bf8c3c6c83 (patch) | |
| tree | b6324d5c38975da08d6cab2060ad01bbd426df5a /eclass/eutils.eclass | |
| parent | Another small multilib fix. (diff) | |
| download | historical-f636c7e0364cbcf10e25aae216bbf2bf8c3c6c83.tar.gz historical-f636c7e0364cbcf10e25aae216bbf2bf8c3c6c83.tar.bz2 historical-f636c7e0364cbcf10e25aae216bbf2bf8c3c6c83.zip | |
let's keep the desktop entry filename slot-wise constant, #94033
Diffstat (limited to 'eclass/eutils.eclass')
| -rw-r--r-- | eclass/eutils.eclass | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass index 9b5168dee31c..1770531c42a4 100644 --- a/eclass/eutils.eclass +++ b/eclass/eutils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.176 2005/05/25 22:07:31 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.177 2005/05/26 15:13:36 carlo Exp $ # # Author: Martin Schlemmer <azarah@gentoo.org> # @@ -860,8 +860,12 @@ make_desktop_entry() { ;; esac fi - - local desktop=${T}/${exec%% *}-${P}.desktop + if [ "${SLOT}" == "0" ] ; then + local desktop_name="${PN}" + else + local desktop_name="${PN}-${SLOT}" + fi + local desktop=${T}/${exec%% *}-${desktop_name}.desktop echo "[Desktop Entry] Encoding=UTF-8 |