bnc#831758: fix symbol icons

libyui · Aug 2, 2013 · 8c5f44a · 8c5f44a
1 parent 50e127f
commit 8c5f44a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/PROJECTINFO.cmake b/PROJECTINFO.cmake
@@ -19,8 +19,12 @@ SET( DESCRIPTION        "This package contains the Qt package selector\ncomponen
 
 ## Things to cleanup; probably too yast2 related
 
+IF( NOT PREFIX )
+  SET( PREFIX "/usr" )
+ENDIF( NOT PREFIX )
+
 # used in src/icons and YQPackageSelectorHelp.cc (via -DHELPIMAGEDIR) probably specific to this file
-SET( INSTALL_HELP_ICONS_DIR 	"${CMAKE_INSTALL_PREFIX}/share/YaST2/images" )
+SET( INSTALL_HELP_ICONS_DIR 	"${PREFIX}/share/YaST2/images" )
 
 # maybe '#include <yui/Libyui_config.h>' rather than using '-DTHEMEDIR'
-SET( YUIQT_THEMEDIR		"${CMAKE_INSTALL_PREFIX}/share/YaST2/theme" )
+SET( YUIQT_THEMEDIR		"${PREFIX}/share/YaST2/theme" )
diff --git a/libyui-qt-pkg.spec.in b/libyui-qt-pkg.spec.in
@@ -130,6 +130,7 @@ rm -rf "$RPM_BUILD_ROOT"
 %{_libdir}/@BASELIB@/lib*.so.*
 %doc %dir %{_docdir}/@PROJECTNAME@@SONAME_MAJOR@
 %doc %{_docdir}/@PROJECTNAME@@SONAME_MAJOR@/COPYING*
+%{_prefix}/share/YaST2/images
 
 %files devel
 %defattr(-,root,root)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1 +1,2 @@
 PROCESS_SOURCES()
+SUBDIRS(icons)