From df90bd17c3f48a7b7bbfb00a9167176b08d366a8 Mon Sep 17 00:00:00 2001 From: Johan Dahlin Date: Mon, 13 Sep 2010 10:33:06 -0300 Subject: Do not require .git to be present If .git is not present, do not require the pre-commit hook to be present either --- Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 9904c39..78187eb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -42,10 +42,10 @@ upload-release: $(distdir).tar.gz ssh gnome.org install-module $(distdir).tar.gz check-local: - @test -f .git/hooks/pre-commit || (echo -e "ERROR: missing \ - pre-commit hook.\n\ncopy misc/pre-commit to .git/hooks"; false) - @test -x .git/hooks/pre-commit || (echo -e "ERROR: pre-commit \ - is not executable\n\nrun chmod +x .git/hooks/pre-commit"; false) + @test ! -d $(top_srcdir)/.git || (test -f .git/hooks/pre-commit || (echo -e "ERROR: missing \ + pre-commit hook.\n\ncopy misc/pre-commit to .git/hooks"; false)) + @test ! -d $(top_srcdir)/.git || (test -x .git/hooks/pre-commit || (echo -e "ERROR: pre-commit \ + is not executable\n\nrun chmod +x .git/hooks/pre-commit"; false)) @echo " PEP-8 INQUISITION" @find $(top_srcdir)/giscanner -name \*.py | sort | uniq | xargs $(PYTHON) $(top_srcdir)/misc/pep8.py --repeat --exclude=config.py @echo " CHECK Pyflakes" -- cgit v1.2.3