[Digikam-devel] extragear/graphics/digikam/data/icons

[Luka Renko]

SVN commit 938396 by lure:

Install all Digikam icons to /usr/share/kde4/apps/digikam/icons

These were installed to /usr/share/icons before, some even
in conflict with the one's shipped by Oxygen. This have caused
that packagers have implemented various workarounds.

This should be tested on Windows & Mac OS X ports to ensure
that this works (it should).

CCMAIL: digikam-devel at kde.org



 M  +1 -1      CMakeLists.txt  
 M  +1 -1      digikam/CMakeLists.txt  
 M  +1 -1      oxygen/CMakeLists.txt  


--- trunk/extragear/graphics/digikam/data/icons/CMakeLists.txt #938395:938396
@@ -1,6 +1,6 @@
 # Install standard icons.
 
-KDE4_INSTALL_ICONS( ${ICON_INSTALL_DIR} )
+KDE4_INSTALL_ICONS( ${DATA_INSTALL_DIR}/digikam/icons )
 
 # Install Oxygen icons.
 add_subdirectory(oxygen)
--- trunk/extragear/graphics/digikam/data/icons/digikam/CMakeLists.txt #938395:938396
@@ -1,3 +1,3 @@
 # Install standard icons.
 
-KDE4_INSTALL_ICONS( ${ICON_INSTALL_DIR} )
+KDE4_INSTALL_ICONS( ${DATA_INSTALL_DIR}/digikam/icons )
--- trunk/extragear/graphics/digikam/data/icons/oxygen/CMakeLists.txt #938395:938396
@@ -1,4 +1,4 @@
 
 set(oxygen_icon_dirs 128x128 16x16 22x22 32x32 48x48 64x64 scalable)
 
-install(DIRECTORY ${oxygen_icon_dirs} DESTINATION ${ICON_INSTALL_DIR}/oxygen PATTERN .svn EXCLUDE)
+install(DIRECTORY ${oxygen_icon_dirs} DESTINATION ${DATA_INSTALL_DIR}/digikam/icons/oxygen PATTERN .svn EXCLUDE)