1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
|
$NetBSD: patch-Makefile,v 1.6 2022/10/07 10:10:05 adam Exp $
Do not override compiler/linker flags.
Provide proper path for Perl module.
Do not install git-p4 (requires Python).
Fix tar operations.
--- Makefile.orig 2022-10-02 23:02:46.000000000 +0000
+++ Makefile
@@ -549,7 +549,7 @@ mergetoolsdir = $(gitexecdir)/mergetools
sharedir = $(prefix)/share
gitwebdir = $(sharedir)/gitweb
gitwebstaticdir = $(gitwebdir)/static
-perllibdir = $(sharedir)/perl5
+perllibdir = ${PERLLIBDIR}
localedir = $(sharedir)/locale
template_dir = share/git-core/templates
htmldir = $(prefix)/share/doc/git-doc
@@ -570,13 +570,9 @@ perllibdir_relative = $(patsubst $(prefi
export prefix bindir sharedir sysconfdir perllibdir localedir
# Set our default programs
-CC = cc
-AR = ar
RM = rm -f
DIFF = diff
-TAR = tar
FIND = find
-INSTALL = install
TCL_PATH = tclsh
TCLTK_PATH = wish
XGETTEXT = xgettext
@@ -683,7 +679,6 @@ clean-python-script:
SCRIPTS = $(SCRIPT_SH_GEN) \
$(SCRIPT_PERL_GEN) \
- $(SCRIPT_PYTHON_GEN) \
git-instaweb
ETAGS_TARGET = TAGS
@@ -2191,8 +2186,8 @@ ifdef DEFAULT_HELP_FORMAT
BASIC_CFLAGS += -DDEFAULT_HELP_FORMAT='"$(DEFAULT_HELP_FORMAT)"'
endif
-ALL_CFLAGS += $(BASIC_CFLAGS)
-ALL_LDFLAGS += $(BASIC_LDFLAGS)
+ALL_CFLAGS = $(BASIC_CFLAGS) $(CPPFLAGS) $(CFLAGS)
+ALL_LDFLAGS = $(BASIC_LDFLAGS) $(LDFLAGS)
export DIFF TAR INSTALL DESTDIR SHELL_PATH
@@ -3261,12 +3256,12 @@ endif
ifndef NO_GETTEXT
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(localedir_SQ)'
(cd po/build/locale && $(TAR) cf - .) | \
- (cd '$(DESTDIR_SQ)$(localedir_SQ)' && umask 022 && $(TAR) xof -)
+ (cd '$(DESTDIR_SQ)$(localedir_SQ)' && umask 022 && $(TAR) xf -)
endif
ifndef NO_PERL
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perllibdir_SQ)'
(cd perl/build/lib && $(TAR) cf - .) | \
- (cd '$(DESTDIR_SQ)$(perllibdir_SQ)' && umask 022 && $(TAR) xof -)
+ (cd '$(DESTDIR_SQ)$(perllibdir_SQ)' && umask 022 && $(TAR) xf -)
endif
ifndef NO_TCLTK
$(MAKE) -C gitk-git install
@@ -3333,7 +3328,7 @@ install-man: install-man-perl
install-man-perl: man-perl
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(mandir_SQ)/man3'
(cd perl/build/man/man3 && $(TAR) cf - .) | \
- (cd '$(DESTDIR_SQ)$(mandir_SQ)/man3' && umask 022 && $(TAR) xof -)
+ (cd '$(DESTDIR_SQ)$(mandir_SQ)/man3' && umask 022 && $(TAR) xf -)
install-html:
$(MAKE) -C Documentation install-html
|
