summaryrefslogtreecommitdiffstats
path: root/kmix
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2012-05-21 12:44:28 -0500
committerDarrell Anderson <humanreadable@yahoo.com>2012-05-21 12:44:28 -0500
commit7eb7626c8a6d819c040cd9aba0b0bca3b484fde7 (patch)
treebe59bab6a1ae8f80bd033fb910bd84e04a15a9d5 /kmix
parent8fe31701f6c8e0f4ef6da2cff9200f269583946b (diff)
downloadtdemultimedia-7eb7626c8a6d819c040cd9aba0b0bca3b484fde7.tar.gz
tdemultimedia-7eb7626c8a6d819c040cd9aba0b0bca3b484fde7.zip
Reverse patch from GIT hash 2cc2e3a2.
Diffstat (limited to 'kmix')
-rw-r--r--kmix/CMakeLists.txt1
-rw-r--r--kmix/Makefile.am2
2 files changed, 1 insertions, 2 deletions
diff --git a/kmix/CMakeLists.txt b/kmix/CMakeLists.txt
index 237c95d4..a8a419f7 100644
--- a/kmix/CMakeLists.txt
+++ b/kmix/CMakeLists.txt
@@ -26,7 +26,6 @@ link_directories(
##### other data ################################
install( FILES kmix.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
-install( FILES kmix.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} )
install( FILES kmixui.rc DESTINATION ${DATA_INSTALL_DIR}/kmix )
install( FILES restore_kmix_volumes.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} )
install( FILES kmixapplet.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/applets )
diff --git a/kmix/Makefile.am b/kmix/Makefile.am
index d2da7028..50513635 100644
--- a/kmix/Makefile.am
+++ b/kmix/Makefile.am
@@ -49,7 +49,7 @@ xdg_apps_DATA = kmix.desktop
rcdir = $(kde_datadir)/kmix
rc_DATA = kmixui.rc
-autostart_DATA = kmix.desktop restore_kmix_volumes.desktop
+autostart_DATA = restore_kmix_volumes.desktop
autostartdir = $(datadir)/autostart
lnkdir = $(kde_datadir)/kicker/applets