You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
79 lines
2.8 KiB
79 lines
2.8 KiB
Index: Documentation/Makefile |
|
--- Documentation/Makefile.orig 2020-10-29 23:11:30.000000000 +0100 |
|
+++ Documentation/Makefile 2020-10-30 14:50:38.289596000 +0100 |
|
@@ -141,12 +141,12 @@ |
|
|
|
MAKEINFO = makeinfo |
|
INSTALL_INFO = install-info |
|
-DOCBOOK2X_TEXI = docbook2x-texi |
|
+DOCBOOK2X_TEXI = docbook2texi |
|
DBLATEX = dblatex |
|
ASCIIDOC_DBLATEX_DIR = /etc/asciidoc/dblatex |
|
DBLATEX_COMMON = -p $(ASCIIDOC_DBLATEX_DIR)/asciidoc-dblatex.xsl -s $(ASCIIDOC_DBLATEX_DIR)/asciidoc-dblatex.sty |
|
ifndef PERL_PATH |
|
- PERL_PATH = /usr/bin/perl |
|
+ PERL_PATH = perl |
|
endif |
|
|
|
-include ../config.mak.autogen |
|
Index: Makefile |
|
--- Makefile.orig 2020-10-29 23:11:30.000000000 +0100 |
|
+++ Makefile 2020-10-30 14:51:54.547291000 +0100 |
|
@@ -524,15 +524,15 @@ |
|
|
|
prefix = $(HOME) |
|
bindir = $(prefix)/bin |
|
-mandir = $(prefix)/share/man |
|
+mandir = $(prefix)/man |
|
infodir = $(prefix)/share/info |
|
-gitexecdir = libexec/git-core |
|
+gitexecdir = libexec/git |
|
mergetoolsdir = $(gitexecdir)/mergetools |
|
sharedir = $(prefix)/share |
|
gitwebdir = $(sharedir)/gitweb |
|
perllibdir = $(sharedir)/perl5 |
|
localedir = $(sharedir)/locale |
|
-template_dir = share/git-core/templates |
|
+template_dir = share/git/templates |
|
htmldir = $(prefix)/share/doc/git-doc |
|
ETC_GITCONFIG = $(sysconfdir)/gitconfig |
|
ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes |
|
@@ -2929,6 +2929,11 @@ |
|
$(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' |
|
$(INSTALL) -m 644 $(SCRIPT_LIB) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' |
|
$(INSTALL) $(install_bindir_programs) '$(DESTDIR_SQ)$(bindir_SQ)' |
|
+ $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(prefix)/lib' |
|
+ $(INSTALL) -m 644 $(LIB_FILE) '$(DESTDIR_SQ)$(prefix)/lib/libgit.a' |
|
+ $(INSTALL) -m 644 $(XDIFF_LIB) '$(DESTDIR_SQ)$(prefix)/lib/libgit-xdiff.a' |
|
+ $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(prefix)/include/git' |
|
+ for h in $(LIB_H); do b=`echo $$h | sed -e 's;/*[^/][^/]*$$;;'`; $(INSTALL) -d -m 755 $(DESTDIR_SQ)$(prefix)/include/git/$$b; $(INSTALL) -m 644 $$h $(DESTDIR_SQ)$(prefix)/include/git/$$h; done |
|
ifdef MSVC |
|
# We DO NOT install the individual foo.o.pdb files because they |
|
# have already been rolled up into the exe's pdb file. |
|
Index: config.mak.in |
|
--- config.mak.in.orig 2020-10-29 23:11:30.000000000 +0100 |
|
+++ config.mak.in 2020-10-30 14:50:38.290142000 +0100 |
|
@@ -14,9 +14,9 @@ |
|
prefix = @prefix@ |
|
exec_prefix = @exec_prefix@ |
|
bindir = @bindir@ |
|
-gitexecdir = @libexecdir@/git-core |
|
+gitexecdir = @libexecdir@/git |
|
datarootdir = @datarootdir@ |
|
-template_dir = @datadir@/git-core/templates |
|
+template_dir = @datadir@/git/templates |
|
sysconfdir = @sysconfdir@ |
|
docdir = @docdir@ |
|
|
|
Index: templates/Makefile |
|
--- templates/Makefile.orig 2020-10-29 23:11:30.000000000 +0100 |
|
+++ templates/Makefile 2020-10-30 14:50:38.290270000 +0100 |
|
@@ -8,7 +8,7 @@ |
|
TAR ?= tar |
|
RM ?= rm -f |
|
prefix ?= $(HOME) |
|
-template_instdir ?= $(prefix)/share/git-core/templates |
|
+template_instdir ?= $(prefix)/share/git/templates |
|
# DESTDIR= |
|
|
|
ifndef SHELL_PATH
|
|
|