| 1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980 |
- Index: Documentation/Makefile
- --- Documentation/Makefile.orig 2021-11-15 08:28:57.000000000 +0100
- +++ Documentation/Makefile 2021-11-15 22:12:05.586982000 +0100
- @@ -153,12 +153,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 2021-11-15 08:28:57.000000000 +0100
- +++ Makefile 2021-11-15 22:31:29.998433000 +0100
- @@ -517,15 +517,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
- @@ -3016,6 +3016,11 @@
- $(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)'
- + $(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
- Index: config.mak.in
- --- config.mak.in.orig 2021-11-15 08:28:57.000000000 +0100
- +++ config.mak.in 2021-11-15 22:12:05.587629000 +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 2021-11-15 08:28:57.000000000 +0100
- +++ templates/Makefile 2021-11-15 22:12:05.587737000 +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
|
