From 3dd9fca200d121517a7ba25ad8ba9a0a98b320a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Thu, 8 Nov 2012 02:58:39 +0100
Subject: Fix various cmake build issues Fix automake build issue in
 kapptemplate

---
 kapptemplate/CMakeLists.txt       | 4 ++++
 kapptemplate/admin/CMakeLists.txt | 7 ++++++-
 kapptemplate/admin/Makefile.am    | 4 ++--
 3 files changed, 12 insertions(+), 3 deletions(-)

(limited to 'kapptemplate')

diff --git a/kapptemplate/CMakeLists.txt b/kapptemplate/CMakeLists.txt
index 399917a9..1be17f9c 100644
--- a/kapptemplate/CMakeLists.txt
+++ b/kapptemplate/CMakeLists.txt
@@ -23,6 +23,10 @@ configure_file( kapptemplate.cmake kapptemplate @ONLY )
 
 install( PROGRAMS
     ${CMAKE_CURRENT_BINARY_DIR}/kapptemplate
+  DESTINATION ${BIN_INSTALL_DIR} )
+
+install( PROGRAMS
+    ${CMAKE_CURRENT_SOURCE_DIR}/mkinstalldirs
   DESTINATION ${DATA_INSTALL_DIR}/kapptemplate/bin )
 
 install( FILES
diff --git a/kapptemplate/admin/CMakeLists.txt b/kapptemplate/admin/CMakeLists.txt
index 8b0806d2..56076c9f 100644
--- a/kapptemplate/admin/CMakeLists.txt
+++ b/kapptemplate/admin/CMakeLists.txt
@@ -9,4 +9,9 @@
 #
 #################################################
 
-tde_install_empty_directory( ${DATA_INSTALL_DIR}/kapptemplate/admin )
+install(
+  DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../admin/
+  DESTINATION ${DATA_INSTALL_DIR}/kapptemplate/admin
+  USE_SOURCE_PERMISSIONS
+  REGEX "Makefile(|\\.in|\\.am)$|.*-orig$" EXCLUDE
+)
diff --git a/kapptemplate/admin/Makefile.am b/kapptemplate/admin/Makefile.am
index fef6965c..16847934 100644
--- a/kapptemplate/admin/Makefile.am
+++ b/kapptemplate/admin/Makefile.am
@@ -1,8 +1,8 @@
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(kde_datadir)/kapptemplate/admin
 	for file in $(srcdir)/*; do \
-		if [ -f $$file -a $$file != 'Makefile' -a $$file != 'Makefile.in' -a $$file != 'Makefile.am' ]; then \
-			destfile=`basename $$file` \
+		destfile=`basename $$file`; \
+		if [ -f $$file -a $$destfile != 'Makefile' -a $$destfile != 'Makefile.in' -a $$destfile != 'Makefile.am' ]; then \
 			$(INSTALL_DATA) $$file \
 				$(DESTDIR)$(kde_datadir)/kapptemplate/admin/$$destfile; \
 		fi \
-- 
cgit v1.2.1