From: Ed Maste <emaste@freebsd.org>
Date: Fri, 7 Dec 2012 15:26:12 +0000 (-0500)
Subject: Prevent pager from appearing during build
X-Git-Tag: sliver-openvswitch-1.9.90-3~10^2~107
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=b411e5c35132f61cc1fd99dbeb1ed3f859d6f5ac;p=sliver-openvswitch.git

Prevent pager from appearing during build

The config.h check added in commit 9e4ba00 may bring up the pager during
build (depending on git config).

Signed-off-by: Ed Maste <emaste@freebsd.org>
Signed-off-by: Ben Pfaff <blp@nicira.com>
---

diff --git a/Makefile.am b/Makefile.am
index b00b82ccb..fe6aa458e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -174,7 +174,7 @@ ALL_LOCAL += config-h-check
 config-h-check:
 	@cd $(srcdir); \
 	if test -e .git && (git --version) >/dev/null 2>&1 && \
-	   git grep -L '#include <config\.h>' `git ls-files | grep '\.c$$' | \
+	   git --no-pager grep -L '#include <config\.h>' `git ls-files | grep '\.c$$' | \
                grep -vE '^datapath|^lib/sflow|^third-party'`; \
 	then \
 	    echo "See above for list of violations of the rule that"; \