X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile.am;h=be5c7ae9dfa1193f2c60bb3e1089ea3818a1e32e;hb=6ef257ae34edc6d1022f02bd92de9781170d9325;hp=c475469d0907852ca286595b54c2613e1c18fa1d;hpb=531de52e961c7feaa6f5e86f1de36afa69ab1fab;p=pspp

diff --git a/Makefile.am b/Makefile.am
index c475469d09..be5c7ae9df 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,9 +1,25 @@
+## PSPP - a program for statistical analysis.
+## Copyright (C) 2019 Free Software Foundation, Inc.
+##
+## This program is free software: you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation, either version 3 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 ## Process this file with automake to produce Makefile.in  -*- makefile -*-
 
 AUTOMAKE_OPTIONS = std-options check-news 1.10.1 subdir-objects
 
 SUBDIRS = gl po
-DISTCLEANFILES = ./po/stamp-po xconfigure 
+DISTCLEANFILES = ./po/stamp-po xconfigure
 BUILT_SOURCES =
 
 AM_CPPFLAGS = \
@@ -30,9 +46,9 @@ all_q_sources =
 pkgsysconfdir = $(sysconfdir)/$(PACKAGE)
 
 
-EXTRA_DIST = ONEWS pspp-mode.el
+EXTRA_DIST = ONEWS
 
-CLEANFILES = 
+CLEANFILES =
 CLEAN_LOCAL =
 ALL_LOCAL =
 CHECK_LOCAL =
@@ -44,7 +60,7 @@ check_PROGRAMS=
 bin_PROGRAMS=
 dist_man_MANS =
 DIST_HOOKS =
-INSTALL_DATA_HOOKS = 
+INSTALL_DATA_HOOKS =
 UNINSTALL_DATA_HOOKS =
 PHONY =
 SUFFIXES = .q
@@ -58,8 +74,8 @@ noinst_HEADERS = $(EXTRA_DIST)
 
 generate-changelog:
 	if test -d $(top_srcdir)/.git; then			\
-	  $(top_srcdir)/build-aux/gitlog-to-changelog --since=2008-07-27	\
-	    > $(distdir)/cl-t;					\
+	  $(top_srcdir)/build-aux/gitlog-to-changelog --since=2008-07-27  --srcdir=$(top_srcdir) \
+	    > $(distdir)/cl-t || exit 1;					\
 	  rm -f $(distdir)/ChangeLog;				\
 	  mv $(distdir)/cl-t $(distdir)/ChangeLog;		\
 	fi
@@ -113,11 +129,16 @@ 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'			    \
+	    | grep -vE '\.gitignore|README.Git|Smake|Bug-administration'    \
 	    | LC_ALL=C sort -u > gitfiles;				    \
 	  LC_ALL=C comm -1 -3 distfiles gitfiles > missing-distfiles;	    \
 	  if test -s missing-distfiles; then				    \
@@ -128,11 +149,11 @@ dist-hook-git: distfiles
 	fi
 # The following is based on commands for the Automake "distdir" target.
 distfiles: Makefile
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	@srcdirstrip=`echo "$(srcdir)" | $(SED) 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | $(SED) 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
 	for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
+	  $(SED) -e "s|^$$srcdirstrip/||;t" \
 	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t" \
 	  | LC_ALL=C sort -u > $@
 CLEANFILES += distfiles gitfiles missing-distfiles