Ticket #24153: 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
     
    260260gitexecdir = libexec/git-core
    261261sharedir = $(prefix)/share
    262262template_dir = share/git-core/templates
    263 htmldir = share/doc/git-doc
     263htmldir = share/doc/git-core
    264264ifeq ($(prefix),/usr)
    265265sysconfdir = /etc
    266266ETC_GITCONFIG = $(sysconfdir)/gitconfig
     
    10541054        ifdef NO_R_TO_GCC_LINKER
    10551055                # Some gcc does not accept and pass -R to the linker to specify
    10561056                # the runtime dynamic library path.
    1057                 CC_LD_DYNPATH = -Wl,-rpath,
     1057                CC_LD_DYNPATH = -L
    10581058        else
    10591059                CC_LD_DYNPATH = -R
    10601060        endif
     
    10721072        REMOTE_CURL_NAMES =
    10731073else
    10741074        ifdef CURLDIR
    1075                 # Try "-Wl,-rpath=$(CURLDIR)/$(lib)" in such a case.
     1075                # Try "-Wl,-rpath,$(CURLDIR)/$(lib)" in such a case.
    10761076                BASIC_CFLAGS += -I$(CURLDIR)/include
    10771077                CURL_LIBCURL = -L$(CURLDIR)/$(lib) $(CC_LD_DYNPATH)$(CURLDIR)/$(lib) -lcurl
    10781078        else