Ticket #23014: patch-Makefile.diff

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

    old new  
    131131#
    132132# Define NO_R_TO_GCC_LINKER if your gcc does not like "-R/path/lib"
    133133# that tells runtime paths to dynamic libraries;
    134 # "-Wl,-rpath=/path/lib" is used instead.
     134# "-Wl,-rpath,/path/lib" is used instead.
    135135#
    136136# Define USE_NSEC below if you want git to care about sub-second file mtimes
    137137# and ctimes. Note that you need recent glibc (at least 2.2.4) for this, and
     
    265265gitexecdir = libexec/git-core
    266266sharedir = $(prefix)/share
    267267template_dir = share/git-core/templates
    268 htmldir = share/doc/git-doc
     268htmldir = share/doc/git-core
    269269ifeq ($(prefix),/usr)
    270270sysconfdir = /etc
    271271ETC_GITCONFIG = $(sysconfdir)/gitconfig
     
    10681068        ifdef NO_R_TO_GCC_LINKER
    10691069                # Some gcc does not accept and pass -R to the linker to specify
    10701070                # the runtime dynamic library path.
    1071                 CC_LD_DYNPATH = -Wl,-rpath,
     1071                CC_LD_DYNPATH = -L
    10721072        else
    10731073                CC_LD_DYNPATH = -R
    10741074        endif
     
    10831083        BASIC_CFLAGS += -DNO_CURL
    10841084else
    10851085        ifdef CURLDIR
    1086                 # Try "-Wl,-rpath=$(CURLDIR)/$(lib)" in such a case.
     1086                # Try "-Wl,-rpath,$(CURLDIR)/$(lib)" in such a case.
    10871087                BASIC_CFLAGS += -I$(CURLDIR)/include
    10881088                CURL_LIBCURL = -L$(CURLDIR)/$(lib) $(CC_LD_DYNPATH)$(CURLDIR)/$(lib) -lcurl
    10891089        else