Fix installation of unwanted git files into kapptemplate

This resolves Bug 1466
(cherry picked from commit e27dd07d4d)
v3.5.13-sru
Slávek Banko 12 years ago
parent 529d5b04ea
commit f6ae9a0baa

@ -13,5 +13,5 @@ install(
DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../admin/ DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../admin/
DESTINATION ${DATA_INSTALL_DIR}/kapptemplate/admin DESTINATION ${DATA_INSTALL_DIR}/kapptemplate/admin
USE_SOURCE_PERMISSIONS USE_SOURCE_PERMISSIONS
REGEX "Makefile(|\\.in|\\.am)$|.*-orig$" EXCLUDE REGEX "Makefile(|\\.in|\\.am)$|.*-orig$|(^|/)\\.git(|modules)$" EXCLUDE
) )

@ -2,7 +2,7 @@ install-data-local:
$(mkinstalldirs) $(DESTDIR)$(kde_datadir)/kapptemplate/admin $(mkinstalldirs) $(DESTDIR)$(kde_datadir)/kapptemplate/admin
for file in $(srcdir)/*; do \ for file in $(srcdir)/*; do \
destfile=`basename $$file`; \ 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 \ $(INSTALL_DATA) $$file \
$(DESTDIR)$(kde_datadir)/kapptemplate/admin/$$destfile; \ $(DESTDIR)$(kde_datadir)/kapptemplate/admin/$$destfile; \
fi \ fi \

Loading…
Cancel
Save