[Xfce4-commits] [panel-plugins/xfce4-whiskermenu-plugin] 13/28: Fix incorrect data install path.

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

gottcode pushed a commit to annotated tag v1.0.1
in repository panel-plugins/xfce4-whiskermenu-plugin.

commit 37b1806f5db92056731a83cddaae987aca747f25
Author: Graeme Gott <graeme at gottcode.org>
Date:   Mon Jun 24 07:25:17 2013 -0400

    Fix incorrect data install path.
---
 CMakeLists.txt       | 8 ++------
 INSTALL              | 4 ----
 icons/CMakeLists.txt | 2 ++
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 64e69a7..8c1b49a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,17 +12,13 @@ if(NOT DEFINED LIB_INSTALL_DIR)
 endif()
 
 if(NOT DEFINED DATA_INSTALL_DIR)
-    if (DEFINED CMAKE_DATA_PATH)
-        set(DATA_INSTALL_DIR ${CMAKE_DATA_PATH})
+    if (DEFINED CMAKE_INSTALL_DATADIR)
+        set(DATA_INSTALL_DIR ${CMAKE_INSTALL_DATADIR})
     else()
         set(DATA_INSTALL_DIR share)
     endif()
 endif()
 
-if(NOT DEFINED ICON_INSTALL_DIR)
-    set(ICON_INSTALL_DIR ${DATA_INSTALL_DIR}/icons)
-endif()
-
 if(NOT DEFINED LOCALE_INSTALL_DIR)
     if (DEFINED CMAKE_LOCALE_PATH)
         set(LOCALE_INSTALL_DIR ${CMAKE_LOCALE_PATH})
diff --git a/INSTALL b/INSTALL
index 8c0874f..06ffecf 100644
--- a/INSTALL
+++ b/INSTALL
@@ -60,10 +60,6 @@ More CMake Options
     Choose where the data files are installed
     (defaults to $CMAKE_INSTALL_PREFIX/share).
 
--DICON_INSTALL_DIR=<path>
-    Choose where the icons are installed
-    (defaults to $DATA_INSTALL_DIR/icons).
-
 -DLOCALE_INSTALL_DIR=<path>
     Choose where the localization files are installed
     (defaults to $DATA_INSTALL_DIR/locale).
diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt
index 4659c16..0756846 100644
--- a/icons/CMakeLists.txt
+++ b/icons/CMakeLists.txt
@@ -1,3 +1,5 @@
+set(ICON_INSTALL_DIR ${DATA_INSTALL_DIR}/icons)
+
 install(FILES hi16-app-whiskermenu.png
         DESTINATION ${ICON_INSTALL_DIR}/hicolor/16x16/apps
         RENAME xfce4-whiskermenu.png)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.