You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2019/01/08 17:19:54 UTC

[trafficserver] branch master updated: Fixes the hook install conditional, Makefile.am is finicky...

This is an automated email from the ASF dual-hosted git repository.

zwoop pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/master by this push:
     new 70b42d1  Fixes the hook install conditional, Makefile.am is finicky...
70b42d1 is described below

commit 70b42d1c429380dd4cd9fd1c0effd1f0cbd71143
Author: Leif Hedstrom <zw...@apache.org>
AuthorDate: Mon Jan 7 20:42:35 2019 -0700

    Fixes the hook install conditional, Makefile.am is finicky...
---
 Makefile.am | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 188b653..133c31d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -95,8 +95,10 @@ install-examples: examples
 	@cd example && $(MAKE) $(AM_MAKEFLAGS) install pkglibdir=$(pkglibexecdir)
 
 $(abs_top_srcdir)/.git/hooks/pre-commit: $(abs_top_srcdir)/tools/git/pre-commit
-	[ -d $(abs_top_srcdir)/.git/hooks ] && \
-		cp $(abs_top_srcdir)/tools/git/pre-commit $(abs_top_srcdir)/.git/hooks/pre-commit
+	@if [ -d $(abs_top_srcdir)/.git/hooks ]; then \
+		echo; echo "\tNote: Installing ATS .git/hooks/pre-commit"; echo; \
+		cp $(abs_top_srcdir)/tools/git/pre-commit $(abs_top_srcdir)/.git/hooks/pre-commit; \
+	fi
 
 install-data-hook:
 if BUILD_DOCS