Makefile.am - added check for debian package directory

The debian package is now also maintained via git

https://salsa.debian.org/science-team/pspp

but that repository contains the distribution package. Due to the
.git directory the make process assumes that we are building
a distribution file and adds a check for some missing files. That
check fails if the distribution is under git control. I checked
for the existance of the debian directory as an indicator that
we are building the debian package and disable the check.

diff --git a/Makefile.am b/Makefile.am
index 4e9daebf9da898227d7e8f58224e836deb1dfdc9..f7050f9f1aca742a63608280435dcc1083eb040f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -129,9 +129,14 @@ programs: $(PROGRAMS)
 
 # If we're checked out from a Git repository, make sure that every
 # file that is in Git is distributed.
+# The debian package is now also maintained in git and that contains
+# the distribution files. Do not run this check if we are
+# in a debian package git repository, because the check fails there
 ALL_LOCAL += dist-hook-git
 dist-hook-git: distfiles
-       @if test -e $(srcdir)/.git && (git --version) >/dev/null 2>&1; then \
+       @if test -e $(srcdir)/.git &&                                       \
+           test ! -d $(srcdir)/debian &&                                   \
+            (git --version) >/dev/null 2>&1; then                           \
          (cd $(srcdir) && git ls-files)                                    \
            | grep -vE '\.gitignore|README.Git|Smake|Bug-administration'    \
            | LC_ALL=C sort -u > gitfiles;                                  \