From b92aaf901395c7257dec52cbc6b9613bb71fcb1c Mon Sep 17 00:00:00 2001 From: Friedrich Beckmann Date: Thu, 7 May 2020 17:11:52 +0200 Subject: [PATCH] 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. --- Makefile.am | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 4e9daebf9d..f7050f9f1a 100644 --- 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; \ -- 2.30.2