X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile.am;h=725ee506240365b4764d1bb2ae7a17fa11f5e838;hb=refs%2Fheads%2Fmdd;hp=c475469d0907852ca286595b54c2613e1c18fa1d;hpb=0df9cdd3df66caf4353128feff3008289cda8115;p=pspp

diff --git a/Makefile.am b/Makefile.am
index c475469d09..725ee50624 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -58,8 +58,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
@@ -117,7 +117,7 @@ ALL_LOCAL += dist-hook-git
 dist-hook-git: distfiles
 	@if test -e $(srcdir)/.git && (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 +128,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