diff options
| author | Paul Eggert | 2016-04-13 11:12:15 -0700 |
|---|---|---|
| committer | Paul Eggert | 2016-04-13 11:12:39 -0700 |
| commit | 1aebe99145e9ef612cdb272800904e3ba9297196 (patch) | |
| tree | adff82b1ea3fc1406907a1fb561e84d8d9a9dd9a /make-dist | |
| parent | 7d835d8e792664e201ec50ba5f0a260d91e1fff5 (diff) | |
| download | emacs-1aebe99145e9ef612cdb272800904e3ba9297196.tar.gz emacs-1aebe99145e9ef612cdb272800904e3ba9297196.zip | |
Do not require that .git be a directory
Problem reportyed by Phillip Lord.
* admin/update_autogen, autogen.sh, build-aux/gitlog-to-emacslog:
* configure.ac, make-dist:
Do not require that .git be a directory, as 'git worktree' makes
it a file and not a directory.
Diffstat (limited to 'make-dist')
| -rwxr-xr-x | make-dist | 2 |
1 files changed, 1 insertions, 1 deletions
| @@ -284,7 +284,7 @@ echo "Creating top directory: '${tempdir}'" | |||
| 284 | mkdir ${tempdir} | 284 | mkdir ${tempdir} |
| 285 | 285 | ||
| 286 | if [ "$changelog" = yes ]; then | 286 | if [ "$changelog" = yes ]; then |
| 287 | if test -d .git; then | 287 | if test -e .git; then |
| 288 | echo "Making top-level ChangeLog" | 288 | echo "Making top-level ChangeLog" |
| 289 | make ChangeLog CHANGELOG=${tempdir}/ChangeLog || \ | 289 | make ChangeLog CHANGELOG=${tempdir}/ChangeLog || \ |
| 290 | { x=$?; echo "make ChangeLog FAILED (try --no-changelog?)" >&2; exit $x; } | 290 | { x=$?; echo "make ChangeLog FAILED (try --no-changelog?)" >&2; exit $x; } |