Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs

[gnu-emacs] / admin / update_autogen

diff --git a/admin/update_autogen b/admin/update_autogen
index e9d4aa5287c8da5f53e6a95edb6bf31c012f6990..f27bfe0d1482efbbb61472b80c6e63293c2ba8fb 100755 (executable)
--- a/admin/update_autogen
+++ b/admin/update_autogen
@@ -1,7 +1,7 @@
-#!/bin/bash
+#!/usr/bin/env bash
 ### update_autogen - update some auto-generated files in the Emacs tree
 
-## Copyright (C) 2011-2015 Free Software Foundation, Inc.
+## Copyright (C) 2011-2016 Free Software Foundation, Inc.
 
 ## Author: Glenn Morris <rgm@gnu.org>
 
@@ -49,7 +49,7 @@ cd ../
 
 if [ -d .bzr ]; then
     vcs=bzr
-elif [ -d .git ]; then
+elif [ -e .git ]; then
     vcs=git
 else
     die "Cannot determine vcs"
@@ -94,7 +94,7 @@ changelog_flag=
 ldefs_in=lisp/loaddefs.el
 ldefs_out=lisp/ldefs-boot.el
 changelog_n=$(sed -n 's/CHANGELOG_HISTORY_INDEX_MAX *= *//p' Makefile.in)
-changelog_files="ChangeLog.$changelog_n Makefile.in"
+changelog_files="ChangeLog.$changelog_n"
 sources="configure.ac lib/Makefile.am"
 ## Files to copy into autogendir.
 ## Everything: