317ce5d4d4
ReleaseNotes: https://github.com/git/git/blob/v2.34.1/Documentation/RelNotes/2.34.1.txt ReleaseNotes: https://github.com/git/git/blob/v2.34.0/Documentation/RelNotes/2.34.0.txt PR: 259858 Approved by: maintainer
75 lines
2.5 KiB
Text
75 lines
2.5 KiB
Text
--- Makefile.orig 2021-10-29 22:46:52 UTC
|
|
+++ Makefile
|
|
@@ -517,16 +517,16 @@ GIT-VERSION-FILE: FORCE
|
|
|
|
prefix = $(HOME)
|
|
bindir = $(prefix)/bin
|
|
-mandir = $(prefix)/share/man
|
|
-infodir = $(prefix)/share/info
|
|
+mandir = $(prefix)/man
|
|
+infodir = $(prefix)/info
|
|
gitexecdir = libexec/git-core
|
|
mergetoolsdir = $(gitexecdir)/mergetools
|
|
sharedir = $(prefix)/share
|
|
-gitwebdir = $(sharedir)/gitweb
|
|
-perllibdir = $(sharedir)/perl5
|
|
+gitwebdir = $(sharedir)/examples/git/gitweb
|
|
+perllibdir = %%SITE_PERL%%
|
|
localedir = $(sharedir)/locale
|
|
template_dir = share/git-core/templates
|
|
-htmldir = $(prefix)/share/doc/git-doc
|
|
+htmldir = $(prefix)/share/doc/git
|
|
ETC_GITCONFIG = $(sysconfdir)/gitconfig
|
|
ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes
|
|
lib = lib
|
|
@@ -551,8 +551,8 @@ DIFF = diff
|
|
TAR = tar
|
|
FIND = find
|
|
INSTALL = install
|
|
-TCL_PATH = tclsh
|
|
-TCLTK_PATH = wish
|
|
+TCL_PATH ?= tclsh
|
|
+TCLTK_PATH ?= wish
|
|
XGETTEXT = xgettext
|
|
MSGFMT = msgfmt
|
|
CURL_CONFIG = curl-config
|
|
@@ -1465,9 +1465,9 @@ EXTLIBS += -lz
|
|
|
|
ifndef NO_OPENSSL
|
|
OPENSSL_LIBSSL = -lssl
|
|
- ifdef OPENSSLDIR
|
|
- BASIC_CFLAGS += -I$(OPENSSLDIR)/include
|
|
- OPENSSL_LINK = -L$(OPENSSLDIR)/$(lib) $(CC_LD_DYNPATH)$(OPENSSLDIR)/$(lib)
|
|
+ ifdef OPENSSLBASE
|
|
+ BASIC_CFLAGS += -I$(OPENSSLBASE)/include
|
|
+ OPENSSL_LINK = -L$(OPENSSLBASE)/$(lib) $(CC_LD_DYNPATH)$(OPENSSLBASE)/$(lib)
|
|
else
|
|
OPENSSL_LINK =
|
|
endif
|
|
@@ -2371,7 +2371,7 @@ git-instaweb: git-instaweb.sh GIT-SCRIPT-DEFINES
|
|
chmod +x $@+ && \
|
|
mv $@+ $@
|
|
else # NO_PERL
|
|
-$(SCRIPT_PERL_GEN) git-instaweb: % : unimplemented.sh
|
|
+$(SCRIPT_PERL_GEN) git-instaweb git-request-pull: % : unimplemented.sh
|
|
$(QUIET_GEN) \
|
|
sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
|
|
-e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \
|
|
@@ -2387,7 +2387,7 @@ ifndef NO_PYTHON
|
|
$(SCRIPT_PYTHON_GEN): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS
|
|
$(SCRIPT_PYTHON_GEN): % : %.py
|
|
$(QUIET_GEN) \
|
|
- sed -e '1s|#!.*python|#!$(PYTHON_PATH_SQ)|' \
|
|
+ sed -e '1s|#!.*python.*|#!$(PYTHON_PATH_SQ)|' \
|
|
$< >$@+ && \
|
|
chmod +x $@+ && \
|
|
mv $@+ $@
|
|
@@ -3015,7 +3015,7 @@ install: all
|
|
$(INSTALL) $(SCRIPTS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
|
|
$(INSTALL) -m 644 $(SCRIPT_LIB) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
|
|
$(INSTALL) $(INSTALL_STRIP) $(install_bindir_xprograms) '$(DESTDIR_SQ)$(bindir_SQ)'
|
|
- $(INSTALL) $(BINDIR_PROGRAMS_NO_X) '$(DESTDIR_SQ)$(bindir_SQ)'
|
|
+ if [ $(BINDIR_PROGRAMS_NO_X) ]; then $(INSTALL) $(BINDIR_PROGRAMS_NO_X) '$(DESTDIR_SQ)$(bindir_SQ)'; fi
|
|
|
|
ifdef MSVC
|
|
# We DO NOT install the individual foo.o.pdb files because they
|