Ticket #17222: patch-Makefile.diff

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

    old new  
    113113#
    114114# Define NO_R_TO_GCC_LINKER if your gcc does not like "-R/path/lib"
    115115# that tells runtime paths to dynamic libraries;
    116 # "-Wl,-rpath=/path/lib" is used instead.
     116# "-Wl,-rpath,/path/lib" is used instead.
    117117#
    118118# Define USE_NSEC below if you want git to care about sub-second file mtimes
    119119# and ctimes. Note that you need recent glibc (at least 2.2.4) for this, and
     
    187187gitexecdir = $(prefix)/libexec/git-core
    188188sharedir = $(prefix)/share
    189189template_dir = $(sharedir)/git-core/templates
    190 htmldir=$(sharedir)/doc/git-doc
     190htmldir=$(sharedir)/doc/git-core
    191191ifeq ($(prefix),/usr)
    192192sysconfdir = /etc
    193193else
     
    791791ifdef NO_R_TO_GCC_LINKER
    792792        # Some gcc does not accept and pass -R to the linker to specify
    793793        # the runtime dynamic library path.
    794         CC_LD_DYNPATH = -Wl,-rpath=
     794        CC_LD_DYNPATH = -L
    795795else
    796796        CC_LD_DYNPATH = -R
    797797endif
     
    800800        BASIC_CFLAGS += -DNO_CURL
    801801else
    802802        ifdef CURLDIR
    803                 # Try "-Wl,-rpath=$(CURLDIR)/$(lib)" in such a case.
     803                # Try "-Wl,-rpath,$(CURLDIR)/$(lib)" in such a case.
    804804                BASIC_CFLAGS += -I$(CURLDIR)/include
    805805                CURL_LIBCURL = -L$(CURLDIR)/$(lib) $(CC_LD_DYNPATH)$(CURLDIR)/$(lib) -lcurl
    806806        else