blob: 7c07ea53d5eb98149df08e28139781d29a26f703 (
plain)
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
|
$NetBSD: patch-aa,v 1.4 2007/12/22 19:42:01 tnn Exp $
--- Makefile.in.orig 2007-12-18 07:20:38.000000000 +0100
+++ Makefile.in
@@ -38,7 +38,8 @@ MKDEPFLAGS=@MKDEPFLAGS@;
SOURCES=grap.cc grap_lex.cc *.cc
DISTDIR=@PACKAGE_TARNAME@-@PACKAGE_VERSION@
-CXXFLAGS +=@GXXFLAGS@ @DEFS@
+CXXFLAGS = @CXXFLAGS@
+CPPFLAGS +=@DEFS@
# To suppress optimization of certain files under g++ where
# optimization is costly at compilation time and of minimial use at
@@ -55,7 +56,7 @@ SPOTLESSFILES=grap.1 grap.ps grap.man
include Makefile.common
grap: ${OBJS}
- ${CXX} ${CXXFLAGS} ${LDFLAGS} ${OBJS} ${LDLIBS} -o grap
+ ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${LDFLAGS} ${OBJS} ${LDLIBS} -o grap
.l.cc:
${LEX} -o$@ $<
@@ -74,7 +75,7 @@ grap_lex.cc: grap_lex.l y.tab.h
# that file under g++ by default. If --optimize-grap_tokenizer is
# given to configure, no attempt to suppress optimization is made.
grap_tokenizer.o: grap_tokenizer.cc
- ${CXX} ${CXXFLAGS} ${SUPPRESS_OPT} -c grap_tokenizer.cc
+ ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${SUPPRESS_OPT} -c grap_tokenizer.cc
# flex defines an unused static function. This rule supresses that
# warning under g++.
@@ -98,7 +99,6 @@ grap.1: grap.doc
# The || true lines allow make to continue on systems where install -d
# fails on existing directories.
install: @INSTALL_DEPS@
- strip grap || true
${INSTALL} -d ${DESTDIR}${BINDIR} || true
${INSTALL} -d ${DESTDIR}${MANDIR} || true
${INSTALL} -d ${DESTDIR}${DEFINESDIR} || true
|
