summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-06-30 18:17:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-06-30 18:17:19 (GMT)
commit90c88a698e8bf36ff5812a177f8b6c2f878f229c (patch)
tree9ec632350aa0d4abb989a274dbe8145d3bc234f4 /Makefile
parent72bb989d6e15f1ff443454b5836358ced1dc5bea (diff)
parent206488774238c94ff337dd5c997be441dbde5112 (diff)
downloadgit-90c88a698e8bf36ff5812a177f8b6c2f878f229c.zip
git-90c88a698e8bf36ff5812a177f8b6c2f878f229c.tar.gz
git-90c88a698e8bf36ff5812a177f8b6c2f878f229c.tar.bz2
Merge branch 'maint'
* maint: Correct the name of NO_R_TO_GCC_LINKER in the comment describing it. git-remote: document -n repack: improve documentation on -a option
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index a98e27a..5d60dc8 100644
--- a/Makefile
+++ b/Makefile
@@ -94,9 +94,9 @@ all::
# Define OLD_ICONV if your library has an old iconv(), where the second
# (input buffer pointer) parameter is declared with type (const char **).
#
-# Define NO_R_TO_GCC if your gcc does not like "-R/path/lib" that
-# tells runtime paths to dynamic libraries; "-Wl,-rpath=/path/lib"
-# is used instead.
+# Define NO_R_TO_GCC_LINKER if your gcc does not like "-R/path/lib"
+# that tells runtime paths to dynamic libraries;
+# "-Wl,-rpath=/path/lib" is used instead.
#
# Define USE_NSEC below if you want git to care about sub-second file mtimes
# and ctimes. Note that you need recent glibc (at least 2.2.4) for this, and