40 lines
1.3 KiB
Text
40 lines
1.3 KiB
Text
$NetBSD: patch-aa,v 1.3 2003/07/14 07:12:14 jtb Exp $
|
|
|
|
--- Makefile.in.orig 2003-07-14 07:47:06.000000000 +0100
|
|
+++ Makefile.in 2003-07-14 07:48:40.000000000 +0100
|
|
@@ -31,7 +31,8 @@
|
|
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
|
|
@@ -48,7 +49,7 @@
|
|
include Makefile.common
|
|
|
|
grap: ${OBJS}
|
|
- ${CXX} ${CXXFLAGS} ${LDFLAGS} ${OBJS} ${LDLIBS} -o grap
|
|
+ ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${LDFLAGS} ${OBJS} ${LDLIBS} -o grap
|
|
|
|
.l.cc:
|
|
${LEX} -o$@ $<
|
|
@@ -67,7 +68,7 @@
|
|
# 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++.
|
|
@@ -89,7 +90,6 @@
|
|
# The || true lines allow make to continue on systems where install -d
|
|
# fails on existing directories.
|
|
install: @INSTALL_DEPS@
|
|
- strip grap || true
|
|
${INSTALL} -d ${BINDIR} || true
|
|
${INSTALL} -d ${MANDIR} || true
|
|
${INSTALL} -d ${DEFINESDIR} || true
|