user/sven/git.git/Makefile, branch v1.6.5.4

Merge branch 'tz/maint-rpm' into maint

2009-11-16T07:08:42Z

* tz/maint-rpm: Makefile: Ensure rpm packages can be read by older rpm versions

Merge branch 'tr/maint-roff-quote' into maint

2009-11-16T00:38:36Z

* tr/maint-roff-quote: Quote ' as \(aq in manpages

Makefile: Ensure rpm packages can be read by older rpm versions

2009-11-14T23:52:39Z

The kernel.org hosts where the packages are built are now using Fedora 11, which defaults to sha256 for file digests instead of md5. Older versions of rpm can not handle these packages. Tell rpmbuild to use md5 file digests for better compatibility. Signed-off-by: Todd Zullinger Signed-off-by: Junio C Hamano

Makefile: add compat/bswap.h to LIB_H

2009-11-02T03:01:05Z

Starting with commit 51ea55190b6e72c77c96754c1bf2f149a4714848, git-compat-util.h includes compat/bswap.h Signed-off-by: Dmitry V. Levin Signed-off-by: Junio C Hamano

Do not try to remove directories when removing old links

2009-10-28T06:45:41Z

When building Git with MSVC on Windows, directories named after the Git alias are created for the output files, e.g. there is a "git-merge-index" directory next to the "git-merge-index.exe" executable in the build root. Previously, "make all" just checked if "git-merge-index" and "git-merge-index.exe" are the same file, and if not, tried to remove "git-merge-index". This fails in the case of "git-merge-index" being a directory, which is why this is checked now. Signed-off-by: Sebastian Schuberth Signed-off-by: Junio C Hamano

Quote ' as \(aq in manpages

2009-10-22T19:59:50Z

The docbook/xmlto toolchain insists on quoting ' as \'. This does achieve the quoting goal, but modern 'man' implementations turn the apostrophe into a unicode "proper" apostrophe (given the right circumstances), breaking code examples in many of our manpages. Quote them as \(aq instead, which is an "apostrophe quote" as per the groff_char manpage. Unfortunately, as Anders Kaseorg kindly pointed out, this is not portable beyond groff, so we add an extra Makefile variable GNU_ROFF which you need to enable to get the new quoting. Thanks also to Miklos Vajna for documentation. Signed-off-by: Thomas Rast Signed-off-by: Junio C Hamano

Makefile: clean block-sha1/ directory instead of mozilla-sha1/

2009-10-19T02:45:38Z

'make clean' should remove the object files from block-sha1/ instead of the non-existent mozilla-sha1/ directory. Signed-off-by: Carlos R. Mafra Signed-off-by: Junio C Hamano

Describe DOCBOOK_XSL_172, ASCIIDOC_NO_ROFF options in Makefile

2009-10-09T21:38:14Z

There is excellent documentation for these options in Documentation/Makefile, but some users may never find it. Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano

Merge branch 'ms/msvc'

2009-10-09T07:02:23Z

* ms/msvc: Fix the exit code of MSVC build scripts on cygwin Fix MSVC build on cygwin

Makefile: add a note about the NO_MMAP setting on IRIX and IRIX64

2009-10-09T05:55:25Z

When git is compiled with the MIPSpro 7.4.4m compiler, and NO_PTHREADS is set, and NO_MMAP is _not_ set, then git segfaults when trying to access the first entry in a reflog. If NO_PTHREADS is not set (which implies that the pthread library is linked in), or NO_MMAP _is_ set, then the segfault is not encountered. The conservative choice has been made to set NO_MMAP in the Makefile to avoid this flaw. The GNU C compiler does not produce this behavior. The segfault happens in refs.c:read_ref_at(). The mmap succeeds, and the loop is executed properly until rec is rewound into the first line (reflog entry) of the file. The segfault is caught by test 28 of t1400-update-ref.sh which fails when 'git rev-parse --verify "master@{May 25 2005}"' is called. So, add a comment in the Makefile to describe why NO_MMAP is set and as a hint to those who may be interested in unsetting it. Signed-off-by: Brandon Casey Signed-off-by: Junio C Hamano