summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2013-04-21 02:23:27 +0200
committerSlávek Banko <slavek.banko@axis.cz>2013-04-21 02:24:43 +0200
commite27dd07d4d2ccf1b78f54d77d73ad265ff625343 (patch)
tree61204493f579f2a52e65c10f6d2beadb864d6034
parent9d6e9b8b764e6b0840ce9bb796ac6d6b8aade074 (diff)
downloadtdesdk-e27dd07d4d2ccf1b78f54d77d73ad265ff625343.tar.gz
tdesdk-e27dd07d4d2ccf1b78f54d77d73ad265ff625343.zip
Fix installation of unwanted git files into kapptemplate
This resolves Bug 1466
-rw-r--r--kapptemplate/admin/CMakeLists.txt2
-rw-r--r--kapptemplate/admin/Makefile.am2
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 \