mirror of
https://github.com/Stichting-MINIX-Research-Foundation/pkgsrc-ng.git
synced 2025-09-11 05:22:40 -04:00
52 lines
1.4 KiB
Plaintext
52 lines
1.4 KiB
Plaintext
$NetBSD: patch-aa,v 1.8 2016/09/07 08:56:33 adam Exp $
|
|
|
|
--- Makefile.orig 2016-09-03 01:59:09.000000000 +0000
|
|
+++ Makefile
|
|
@@ -396,8 +396,6 @@ DEVELOPER_CFLAGS = -Werror \
|
|
-Wunused \
|
|
-Wvla
|
|
LDFLAGS =
|
|
-ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS)
|
|
-ALL_LDFLAGS = $(LDFLAGS)
|
|
STRIP ?= strip
|
|
|
|
# Create as necessary, replace existing, make ranlib unneeded.
|
|
@@ -441,13 +439,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
|
|
TCL_PATH = tclsh
|
|
TCLTK_PATH = wish
|
|
XGETTEXT = xgettext
|
|
@@ -1647,8 +1641,8 @@ PAGER_ENV_CQ = "$(subst ",\",$(subst \,\
|
|
PAGER_ENV_CQ_SQ = $(subst ','\'',$(PAGER_ENV_CQ))
|
|
BASIC_CFLAGS += -DPAGER_ENV='$(PAGER_ENV_CQ_SQ)'
|
|
|
|
-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
|
|
|
|
@@ -2341,11 +2335,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
|