From c90313c8d28a635ea8422359eec2a5724f1a017b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 8 Oct 2019 18:52:50 +0200 Subject: [PATCH] Fix installation of files from previous commit. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit 4c973218ebd5830e90f7874adcae27412126122f) --- applnk/CMakeLists.txt | 4 ++-- applnk/Makefile.am | 4 ++-- applnk/tde-essential.menu | 8 -------- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/applnk/CMakeLists.txt b/applnk/CMakeLists.txt index 91f1ae78d..674324779 100644 --- a/applnk/CMakeLists.txt +++ b/applnk/CMakeLists.txt @@ -12,7 +12,7 @@ add_subdirectory( compat ) install( FILES - tde-settings.menu tde-information.menu tde-screensavers.menu + tde-settings.menu tde-screensavers.menu DESTINATION ${XDG_MENU_INSTALL_DIR} ) install( FILES @@ -30,7 +30,7 @@ install( FILES tde-games-board.directory tde-games-card.directory tde-games-kids.directory tde-games-roguelikes.directory tde-games-strategy.directory tde-games.directory - tde-graphics.directory tde-information.directory + tde-graphics.directory tde-settings-information.directory tde-internet-terminal.directory tde-internet.directory tde-more.directory tde-multimedia.directory tde-office.directory tde-science.directory tde-settings-accessibility.directory diff --git a/applnk/Makefile.am b/applnk/Makefile.am index f33dde84a..5eda03223 100644 --- a/applnk/Makefile.am +++ b/applnk/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = compat -xdg_menu_DATA = tde-settings.menu tde-information.menu tde-screensavers.menu +xdg_menu_DATA = tde-settings.menu tde-screensavers.menu xdg_mergedmenu_DATA = tde-essential.menu xdg_mergedmenudir = $(xdg_menudir)/applications-merged @@ -18,7 +18,6 @@ tde-games-roguelikes.directory \ tde-games-strategy.directory \ tde-games.directory \ tde-graphics.directory \ -tde-information.directory \ tde-internet-terminal.directory \ tde-internet.directory \ tde-more.directory \ @@ -28,6 +27,7 @@ tde-science.directory \ tde-settings-accessibility.directory \ tde-settings-components.directory \ tde-settings-desktop.directory \ +tde-settings-information.directory \ tde-settings-looknfeel.directory \ tde-settings-network.directory \ tde-settings-peripherals.directory \ diff --git a/applnk/tde-essential.menu b/applnk/tde-essential.menu index c65994a25..425025ded 100644 --- a/applnk/tde-essential.menu +++ b/applnk/tde-essential.menu @@ -8,14 +8,6 @@ tde-settings.directory ../tde-settings.menu - - Information - tde-information.directory - ../tde-information.menu - - - Settings/InformationInformation - System