Ticket #17805: patch-Makefile.diff

File patch-Makefile.diff, 1.3 KB (added by maccheck@…, 16 years ago)
  • Makefile

    old new  
    115115#
    116116# Define NO_R_TO_GCC_LINKER if your gcc does not like "-R/path/lib"
    117117# that tells runtime paths to dynamic libraries;
    118 # "-Wl,-rpath=/path/lib" is used instead.
     118# "-Wl,-rpath,/path/lib" is used instead.
    119119#
    120120# Define USE_NSEC below if you want git to care about sub-second file mtimes
    121121# and ctimes. Note that you need recent glibc (at least 2.2.4) for this, and
     
    193193gitexecdir = $(prefix)/libexec/git-core
    194194sharedir = $(prefix)/share
    195195template_dir = $(sharedir)/git-core/templates
    196 htmldir=$(sharedir)/doc/git-doc
     196htmldir=$(sharedir)/doc/git-core
    197197ifeq ($(prefix),/usr)
    198198sysconfdir = /etc
    199199else
     
    823823        ifdef NO_R_TO_GCC_LINKER
    824824                # Some gcc does not accept and pass -R to the linker to specify
    825825                # the runtime dynamic library path.
    826                 CC_LD_DYNPATH = -Wl,-rpath,
     826                CC_LD_DYNPATH = -L
    827827        else
    828828                CC_LD_DYNPATH = -R
    829829        endif
     
    833833        BASIC_CFLAGS += -DNO_CURL
    834834else
    835835        ifdef CURLDIR
    836                 # Try "-Wl,-rpath=$(CURLDIR)/$(lib)" in such a case.
     836                # Try "-Wl,-rpath,$(CURLDIR)/$(lib)" in such a case.
    837837                BASIC_CFLAGS += -I$(CURLDIR)/include
    838838                CURL_LIBCURL = -L$(CURLDIR)/$(lib) $(CC_LD_DYNPATH)$(CURLDIR)/$(lib) -lcurl
    839839        else