diff options
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | menu/applications.menu.in | 2 |
2 files changed, 4 insertions, 4 deletions
@@ -5,7 +5,7 @@ NAME = desktop-common-data TAG := $(shell echo "V$(VERSION)_$(RELEASE)" | tr -- '-.' '__') mandir=/usr/share/man -menus: applications.menu kde-applications.menu +menus: applications.menu plasma-applications.menu menu/validated-menu: menu/applications.menu.in xmllint --noout --dtdvalid menu/menu.dtd $? @@ -16,7 +16,7 @@ applications.menu: menu/validated-menu @xmllint --noout --dtdvalid menu/menu.dtd $@ @echo " OK" -kde-applications.menu: menu/validated-menu +plasma-applications.menu: menu/validated-menu @echo -n "generating $@ " @sed -e 's,@MAIN_DESKTOP@,KDE,g' -e 's,@MAIN_TOOLKIT@,Qt,g' -e 's,@ALTERNATIVE_DESKTOP@,GNOME,g' -e 's,@ALTERNATIVE_TOOLKIT@,GTK,g' < menu/applications.menu.in > $@ @xmllint --noout --dtdvalid menu/menu.dtd $@ @@ -36,7 +36,7 @@ checktag: clean: find . -type d -name '.xvpics' -o -name '*~' |xargs rm -rf - rm -f applications.menu kde-applications.menu + rm -f applications.menu plasma-applications.menu # rules to build a distributable rpm diff --git a/menu/applications.menu.in b/menu/applications.menu.in index 033091e..01e25a3 100644 --- a/menu/applications.menu.in +++ b/menu/applications.menu.in @@ -492,7 +492,7 @@ <Menu> <Name>KDE Info Center</Name> <Directory>mandriva-system-configuration-kde.directory</Directory> - <MergeFile>/etc/xdg/kde/menus/kde-information.menu</MergeFile> + <MergeFile>/etc/xdg/menus/kde-information.menu</MergeFile> </Menu> <Menu> <Name>More</Name> |