51 lines
1.4 KiB
Text
51 lines
1.4 KiB
Text
$NetBSD: patch-aa,v 1.4 2014/11/20 21:43:10 bsiegert Exp $
|
|
|
|
--- Makefile.orig 2014-05-30 21:38:10.000000000 +0000
|
|
+++ Makefile
|
|
@@ -354,8 +354,6 @@ GIT-VERSION-FILE: FORCE
|
|
|
|
CFLAGS = -g -O2 -Wall
|
|
LDFLAGS =
|
|
-ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS)
|
|
-ALL_LDFLAGS = $(LDFLAGS)
|
|
STRIP ?= strip
|
|
|
|
# Among the variables below, these:
|
|
@@ -396,13 +394,9 @@ htmldir_relative = $(patsubst $(prefix)/
|
|
|
|
export prefix bindir sharedir sysconfdir gitwebdir localedir
|
|
|
|
-CC = cc
|
|
-AR = ar
|
|
RM = rm -f
|
|
DIFF = diff
|
|
-TAR = tar
|
|
FIND = find
|
|
-INSTALL = install
|
|
RPMBUILD = rpmbuild
|
|
TCL_PATH = tclsh
|
|
TCLTK_PATH = wish
|
|
@@ -1635,8 +1629,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
|
|
|
|
@@ -2349,11 +2343,10 @@ install: all
|
|
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
|
|
$(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install
|
|
- $(MAKE) -C gitweb install
|
|
endif
|
|
ifndef NO_TCLTK
|
|
$(MAKE) -C gitk-git install
|