Ticket #18417: patch-Makefile.diff

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

Updated patch file for git-core Makefile

  • Makefile

    old new  
    118118#
    119119# Define NO_R_TO_GCC_LINKER if your gcc does not like "-R/path/lib"
    120120# that tells runtime paths to dynamic libraries;
    121 # "-Wl,-rpath=/path/lib" is used instead.
     121# "-Wl,-rpath,/path/lib" is used instead.
    122122#
    123123# Define USE_NSEC below if you want git to care about sub-second file mtimes
    124124# and ctimes. Note that you need recent glibc (at least 2.2.4) for this, and
     
    199199gitexecdir = libexec/git-core
    200200sharedir = $(prefix)/share
    201201template_dir = share/git-core/templates
    202 htmldir = share/doc/git-doc
     202htmldir = share/doc/git-core
    203203ifeq ($(prefix),/usr)
    204204sysconfdir = /etc
    205205ETC_GITCONFIG = $(sysconfdir)/gitconfig
     
    833833        ifdef NO_R_TO_GCC_LINKER
    834834                # Some gcc does not accept and pass -R to the linker to specify
    835835                # the runtime dynamic library path.
    836                 CC_LD_DYNPATH = -Wl,-rpath,
     836                CC_LD_DYNPATH = -L
    837837        else
    838838                CC_LD_DYNPATH = -R
    839839        endif
     
    843843        BASIC_CFLAGS += -DNO_CURL
    844844else
    845845        ifdef CURLDIR
    846                 # Try "-Wl,-rpath=$(CURLDIR)/$(lib)" in such a case.
     846                # Try "-Wl,-rpath,$(CURLDIR)/$(lib)" in such a case.
    847847                BASIC_CFLAGS += -I$(CURLDIR)/include
    848848                CURL_LIBCURL = -L$(CURLDIR)/$(lib) $(CC_LD_DYNPATH)$(CURLDIR)/$(lib) -lcurl
    849849        else