From e27dd07d4d2ccf1b78f54d77d73ad265ff625343 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 21 Apr 2013 02:23:27 +0200 Subject: [PATCH] Fix installation of unwanted git files into kapptemplate This resolves Bug 1466 --- kapptemplate/admin/CMakeLists.txt | 2 +- kapptemplate/admin/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kapptemplate/admin/CMakeLists.txt b/kapptemplate/admin/CMakeLists.txt index 56076c9f..3a883c9d 100644 --- a/kapptemplate/admin/CMakeLists.txt +++ b/kapptemplate/admin/CMakeLists.txt @@ -13,5 +13,5 @@ install( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../admin/ DESTINATION ${DATA_INSTALL_DIR}/kapptemplate/admin USE_SOURCE_PERMISSIONS - REGEX "Makefile(|\\.in|\\.am)$|.*-orig$" EXCLUDE + REGEX "Makefile(|\\.in|\\.am)$|.*-orig$|(^|/)\\.git(|modules)$" EXCLUDE ) diff --git a/kapptemplate/admin/Makefile.am b/kapptemplate/admin/Makefile.am index 16847934..3ea7f23f 100644 --- a/kapptemplate/admin/Makefile.am +++ b/kapptemplate/admin/Makefile.am @@ -2,7 +2,7 @@ install-data-local: $(mkinstalldirs) $(DESTDIR)$(kde_datadir)/kapptemplate/admin for file in $(srcdir)/*; do \ destfile=`basename $$file`; \ - if [ -f $$file -a $$destfile != 'Makefile' -a $$destfile != 'Makefile.in' -a $$destfile != 'Makefile.am' ]; then \ + if [ -f $$file -a $$destfile != 'Makefile' -a $$destfile != 'Makefile.in' -a $$destfile != 'Makefile.am' -a $$destfile != '.git' -a $$destfile != '.gitmodules' ]; then \ $(INSTALL_DATA) $$file \ $(DESTDIR)$(kde_datadir)/kapptemplate/admin/$$destfile; \ fi \