Ticket #25551: patch-Makefile.diff

Makefile

@@ -134 +134 @@
 #
 # Define NO_R_TO_GCC_LINKER if your gcc does not like "-R/path/lib"
 # that tells runtime paths to dynamic libraries;
-# "-Wl,-rpath=/path/lib" is used instead.
+# "-Wl,-rpath,/path/lib" is used instead.
 #
 # Define USE_NSEC below if you want git to care about sub-second file mtimes
 # and ctimes. Note that you need recent glibc (at least 2.2.4) for this, and
@@ -273 +273 @@
 gitexecdir = libexec/git-core
 sharedir = $(prefix)/share
 template_dir = share/git-core/templates
-htmldir = share/doc/git-doc
+htmldir = share/doc/git-core
 ifeq ($(prefix),/usr)
 sysconfdir = /etc
 ETC_GITCONFIG = $(sysconfdir)/gitconfig
@@ -1108 +1108 @@
         ifdef NO_R_TO_GCC_LINKER
                 # Some gcc does not accept and pass -R to the linker to specify
                 # the runtime dynamic library path.
-                CC_LD_DYNPATH = -Wl,-rpath,
+                CC_LD_DYNPATH = -L
         else
                 CC_LD_DYNPATH = -R
         endif
@@ -1126 +1126 @@
         REMOTE_CURL_NAMES =
 else
         ifdef CURLDIR
-                # Try "-Wl,-rpath=$(CURLDIR)/$(lib)" in such a case.
+                # Try "-Wl,-rpath,$(CURLDIR)/$(lib)" in such a case.
                 BASIC_CFLAGS += -I$(CURLDIR)/include
                 CURL_LIBCURL = -L$(CURLDIR)/$(lib) $(CC_LD_DYNPATH)$(CURLDIR)/$(lib) -lcurl
         else
@@ -1519 +1519 @@
 
 $(BUILT_INS): git$X
         $(QUIET_BUILT_IN)$(RM) $@ && \
-        ln git$X $@ 2>/dev/null || \
         ln -s git$X $@ 2>/dev/null || \
         cp git$X $@
 
@@ -1828 +1827 @@
 
 $(REMOTE_CURL_ALIASES): $(REMOTE_CURL_PRIMARY)
         $(QUIET_LNCP)$(RM) $@ && \
-        ln $< $@ 2>/dev/null || \
         ln -s $< $@ 2>/dev/null || \
         cp $< $@
 
@@ -2006 +2004 @@
                 cp "$$bindir/git$X" "$$execdir/git$X"; } ; } && \
         { for p in $(BUILT_INS); do \
                 $(RM) "$$execdir/$$p" && \
-                ln "$$execdir/git$X" "$$execdir/$$p" 2>/dev/null || \
                 ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \
                 cp "$$execdir/git$X" "$$execdir/$$p" || exit; \
           done; } && \
         { test x"$(REMOTE_CURL_ALIASES)" = x || \
                 { for p in $(REMOTE_CURL_ALIASES); do \
                 $(RM) "$$execdir/$$p" && \
-                ln "$$execdir/git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
                 ln -s "git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
                 cp "$$execdir/git-remote-http$X" "$$execdir/$$p" || exit; \
           done; } ; } && \