delta/git.git/Makefile, branch as/log-output-encoding-in-user-format

Merge branch 'jk/common-make-variables-export-safety'

2013-04-01T15:59:47+00:00

Make the three variables safer to be exported to submakes by
ensuring that they are full paths so that they can be used as
installation location.

* jk/common-make-variables-export-safety:
  Makefile: make mandir, htmldir and infodir absolute

Merge branch 'maint'

2013-03-17T07:11:11+00:00

* maint:
  rev-parse: clarify documentation of $name@{upstream} syntax
  sha1_name: pass object name length to diagnose_invalid_sha1_path()
  Makefile: keep LIB_H entries together and sorted

Makefile: keep LIB_H entries together and sorted

2013-03-17T05:23:04+00:00

As a follow-up to 60d24dd25 (Makefile: fold XDIFF_H and VCSSVN_H into
LIB_H), let the unconditional additions to LIB_H form a single sorted
list.  Also drop the duplicate entry for xdiff/xdiff.h, which was easy
to spot after sorting.

Signed-off-by: Rene Scharfe 
Signed-off-by: Junio C Hamano

Merge branch 'jn/less-reconfigure' into maint

2013-02-27T17:59:19+00:00

* jn/less-reconfigure:
  Makefile: avoid infinite loop on configure.ac change

Revert "compat: add strtok_r()"

2013-02-26T17:16:58+00:00

This reverts commit 78457bc0ccc1af8b9eb776a0b17986ebd50442bc.

commit 28c5d9e ("vcs-svn: drop string_pool") previously removed
the only call-site for strtok_r. So let's get rid of the compat
implementation as well.

Signed-off-by: Erik Faye-Lund 
Reviewed-by: Jonathan Nieder 
Signed-off-by: Junio C Hamano

Makefile: make mandir, htmldir and infodir absolute

2013-02-25T20:37:04+00:00

This matches the use of the variables with the same names in autotools,
reducing the potential for user surprise.

Using relative paths in these variables also causes issues if they are
exported from the Makefile, as discussed in commit c09d62f (Makefile: do
not export mandir/htmldir/infodir, 2013-02-12).

Suggested-by: Junio C Hamano 
Signed-off-by: John Keeping 
Signed-off-by: Junio C Hamano

Merge branch 'jn/less-reconfigure'

2013-02-25T16:27:13+00:00

A change made on v1.8.1.x maintenance track had a nasty regression
to break the build when autoconf is used.

* jn/less-reconfigure:
  Makefile: avoid infinite loop on configure.ac change

Makefile: avoid infinite loop on configure.ac change

2013-02-21T07:56:05+00:00

If you are using autoconf and change the configure.ac, the
Makefile will notice that config.status is older than
configure.ac, and will attempt to rebuild and re-run the
configure script to pick up your changes. The first step in
doing so is to run "make configure". Unfortunately, this
tries to include config.mak.autogen, which depends on
config.status, which depends on configure.ac; so we must
rebuild config.status. Which leads to us running "make
configure", and so on.

It's easy to demonstrate with:

  make configure
  ./configure
  touch configure.ac
  make

We can break this cycle by not re-invoking make to build
"configure", and instead just putting its rules inline into
our config.status rebuild procedure.  We can avoid a copy by
factoring the rules into a make variable.

Signed-off-by: Jeff King 
Signed-off-by: Junio C Hamano

Merge branch 'mk/make-rm-depdirs-could-be-empty'

2013-02-15T00:06:24+00:00

"make COMPUTE_HEADER_DEPENDENCIES=no clean" would try to run "rm
-rf $(dep_dirs)" with an empty dep_dir, but some implementations of
"rm -rf" barf on an empty argument list.

* mk/make-rm-depdirs-could-be-empty:
  Makefile: don't run "rm" without any files

Merge branch 'mk/old-expat'

2013-02-15T00:06:08+00:00

* mk/old-expat:
  Allow building with xmlparse.h