$NetBSD: patch-aa,v 1.4 2012/11/15 16:44:56 shattered Exp $

--- Makefile.orig	2007-06-12 19:42:03.000000000 +0000
+++ Makefile
@@ -18,7 +18,7 @@ INCLUDES=-I.
 # new gnu compilers have a really annoying default behavior of wrapping
 # error message lines. The default should be NO-WRAPPING.
 OPTIONS=-O2 -Wall -x c++ -fmessage-length=0 -fno-exceptions
-CFLAGS=$(INCLUDES) $(OPTIONS)
+CFLAGS += $(INCLUDES)
 
 OBJECTS = \
 	globals.o \
@@ -44,7 +44,7 @@ OBJECTS = \
 all : tpasm
 
 tpasm : $(OBJECTS)
-	$(CC) -O $(OBJECTS) -lstdc++ -o tpasm
+	$(CXX) $(CFLAGS) $(OBJECTS) -o tpasm
 
 clean :
 	rm -f *.o
@@ -58,5 +58,5 @@ install :
 # suffix rules (this makes sure that the ".o" files
 # end up in their respective directories on all systems)
 .c.o:
-	${CC} ${CFLAGS} ${CPPFLAGS} -o $@ -c $<
+	${CXX} ${CFLAGS} ${CPPFLAGS} -o $@ -c $<