[rkward/frameworks] /: Fix some install locations

[Thomas Friedrichsmeier]

Git commit b1a0306c2435b87a70f3c9564c3468ee1d3b8319 by Thomas Friedrichsmeier.
Committed on 26/11/2015 at 12:41.
Pushed by tfry into branch 'frameworks'.

Fix some install locations

M  +0    -4    TODO
M  +1    -1    rkward/CMakeLists.txt
M  +1    -18   rkward/dataeditor/CMakeLists.txt
M  +1    -1    rkward/misc/CMakeLists.txt

http://commits.kde.org/rkward/b1a0306c2435b87a70f3c9564c3468ee1d3b8319

diff --git a/TODO b/TODO
index ed9cc93..825f7d7 100644
--- a/TODO
+++ b/TODO
@@ -6,10 +6,6 @@ KF5 port:
 Things to do:
 - Remove kde4libssupport classes
 - Adjust platform checks
-- There seems to be a runtime problem resolving signals, if there is another function in the same (derived) class by the same name.
-  - Check for this, somehow, and fix (e.g. by using the proper base class in signal specification)
-  - This regexp looks for signals specifications that look like a member of a class not starting with Q or K (i.e., probably, an RKWard-class):
-    "connect[^:]*[\&\(][^QK][a-zA-Z]*::" . Hopefully, checking these will be enough?
 - Since the conversion from KIcon to QIcon, there is crash on exit, sometimes. Google turns up this: https://github.com/OtterBrowser/otter-browser/issues/889
 - Device window embedding / remove qwinhost
 Things to test at the end:
diff --git a/rkward/CMakeLists.txt b/rkward/CMakeLists.txt
index 73f1e9c..a294c0e 100644
--- a/rkward/CMakeLists.txt
+++ b/rkward/CMakeLists.txt
@@ -85,7 +85,7 @@ ADD_DEPENDENCIES(rkward.frontend rkward)
 INSTALL(DIRECTORY plugins/ pages DESTINATION ${DATA_INSTALL_DIR}/rkward
 	PATTERN .svn EXCLUDE)
 
-INSTALL(FILES resource.ver rkwardui.rc rkconsolepart.rc DESTINATION ${DATA_INSTALL_DIR}/rkward )
+INSTALL(FILES resource.ver rkwardui.rc rkconsolepart.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/rkward )
 
 IF(Q_WS_MAC)
 	INSTALL(TARGETS rkward.frontend DESTINATION ${BIN_INSTALL_DIR})
diff --git a/rkward/dataeditor/CMakeLists.txt b/rkward/dataeditor/CMakeLists.txt
index ad40744..571f627 100644
--- a/rkward/dataeditor/CMakeLists.txt
+++ b/rkward/dataeditor/CMakeLists.txt
@@ -17,21 +17,4 @@ TARGET_LINK_LIBRARIES(dataeditor Qt5::Widgets KF5::KDELibs4Support)
 
 ########### install files ###############
 
-INSTALL(FILES   rkeditordataframepart.rc DESTINATION ${DATA_INSTALL_DIR}/rkward )
-
-
-
-#original Makefile.am contents follow:
-
-#INCLUDES = $(all_includes)
-#METASOURCES = AUTO
-#noinst_LIBRARIES =  libdataeditor.a
-#libdataeditor_a_SOURCES = twintable.cpp twintablemember.cpp rkdrag.cpp \
-#	rkeditor.cpp rkeditordataframe.cpp twintabledatamember.cpp twintablemetamember.cpp \
-#	celleditor.cpp editlabelsdialog.cpp editformatdialog.cpp rkeditordataframepart.cpp
-#noinst_HEADERS = rkdrag.h twintable.h twintablemember.h rkeditor.h \
-#		rkeditordataframe.h twintabledatamember.h twintablemetamember.h celleditor.h \
-#		editlabelsdialog.h editformatdialog.h rkeditordataframepart.h
-#
-#rcdir = $(kde_datadir)/rkward
-#rc_DATA = rkeditordataframepart.rc
+INSTALL(FILES   rkeditordataframepart.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/rkward )
diff --git a/rkward/misc/CMakeLists.txt b/rkward/misc/CMakeLists.txt
index dd4e078..7ace6e5 100644
--- a/rkward/misc/CMakeLists.txt
+++ b/rkward/misc/CMakeLists.txt
@@ -37,4 +37,4 @@ TARGET_LINK_LIBRARIES(misc Qt5::Widgets KF5::KDELibs4Support)
 
 INSTALL(FILES
 	rkdummypart.rc
-	DESTINATION ${DATA_INSTALL_DIR}/rkward)
+	DESTINATION ${KXMLGUI_INSTALL_DIR}/rkward)