Remove vestiges of scripts/ in Makefiles

@@ -59,35 +59,32 @@ SUBDIRS = \
 
 EXTRA_DIST = COPYING.LESSER
 
-.PHONY: make-ChangeLog
-make-ChangeLog: 
-	if test -d .git; then                                           \
-	  $(top_srcdir)/scripts/gitlog-to-changelog |                   \
-            sed '/<unknown>$$/d' | fmt -s > $(distdir)/cl-t;            \
-	  echo "" >> $(distdir)/cl-t;                                 \
-	  echo "Local Variables:" >> $(distdir)/cl-t;                   \
-	  echo "mode: change-log" >> $(distdir)/cl-t;                   \
-	  echo "version-control: never"  >> $(distdir)/cl-t;            \
-	  echo "buffer-read-only: t" >> $(distdir)/cl-t;                \
-	  echo "End:" >> $(distdir)/cl-t;                               \
-	  rm -f $(distdir)/ChangeLog;                                   \
-	  mv $(distdir)/cl-t $(distdir)/ChangeLog;                      \
-	fi
-
-dist-hook: make-ChangeLog
+gen_start_date = 
+prev_change_log = 
 
 .PHONY: ChangeLog
-ChangeLog: 
-	if test -d .git; then                                           \
-	  $(top_srcdir)/scripts/gitlog-to-changelog |                   \
-            sed '/<unknown>$$/d' | fmt -s > ChangeLog;                  \
-	  echo "" >> ChangeLog;                                       \
-	  echo "Local Variables:" >> ChangeLog;                         \
-	  echo "mode: change-log" >> ChangeLog;                         \
-	  echo "version-control: never"  >> ChangeLog;                  \
-	  echo "buffer-read-only: t" >> ChangeLog;                      \
-	  echo "End:" >> ChangeLog;                                     \
-        fi
+ChangeLog:
+	@if test -d .git; then                                             \
+	  cmd=$(top_srcdir)/build-aux/gitlog-to-changelog;                 \
+	  if test -n "$(gen_start_date)"; then                             \
+	    cmd="$$cmd --since=\"$(gen_start_date)\"";                     \
+	  fi;                                                              \
+	  $$cmd |                                                          \
+            sed '/<unknown>$$/d' | fmt -s > cl-t;                          \
+          if test -n "$(prev_change_log)" && test -f "$(prev_change_log)"; \
+	  then                                                             \
+	    echo "" >> cl-t;                                               \
+	    cat "$(prev_change_log)" |                                     \
+	      sed '/^Local Variables:/,/^End:/d' >> cl-t;                  \
+	  fi;                                                              \
+	  echo "Local Variables:" >> cl-t;                                 \
+	  echo "mode: change-log" >> cl-t;                                 \
+	  echo "version-control: never"  >> cl-t;                          \
+	  echo "buffer-read-only: t" >> cl-t;                              \
+	  echo "End:" >> cl-t;                                             \
+	  rm -f ChangeLog;                                                 \
+	  mv cl-t ChangeLog;                                               \
+	fi
 
 alpha:
 	$(MAKE) dist distdir=$(PACKAGE)-$(VERSION)-`date +"%Y%m%d"`

@@ -100,10 +100,10 @@ TEXI2DVI=texi2dvi -t '@set $(RENDITION)' -E
 # Make sure you set TEXINPUTS.
 # TEXINPUTS=/usr/share/texmf/pdftex/plain/misc/ is ok for most distributions
 
-TEXINPUTS=$(srcdir):$(top_srcdir)/scripts:$$TEXINPUTS
+TEXINPUTS=$(srcdir):$(top_srcdir)/build-aux:$$TEXINPUTS
 
 manual:
-	 TEXINPUTS=$(srcdir):$(top_srcdir)/scripts:$(TEXINPUTS) \
+	 TEXINPUTS=$(srcdir):$(top_srcdir)/build-aux:$(TEXINPUTS) \
 	 MAKEINFO="$(MAKEINFO) $(MAKEINFOFLAGS)" \
 	 TEXI2DVI="$(TEXI2DVI) -t @finalout" \
 	$(GENDOCS) $(PACKAGE) '$(PACKAGE_NAME) manual'