$NetBSD: patch-aa,v 1.5 2005/08/07 11:29:27 wiz Exp $

--- Makefile.orig	2005-01-16 20:25:50.000000000 +0100
+++ Makefile
@@ -12,7 +12,7 @@
 # (The wxWindows file locations should really be taken from wx-config.)
 HUGOSOURCEDIR = ../source
 MIKMODINCLUDEDIR = /usr/local/include
-CXXINCLUDEDIR = /usr/include/g++-3
+#CXXINCLUDEDIR = /usr/include/g++-3
 
 # Libraries to be linked:
 # If a working libmikmod.so has been compiled on the runtime system
@@ -23,7 +23,7 @@ STATICLIBS =
 # Uncomment the following if compiling with GTK 1.2 support:
 #LDFLAGS = `wx-config --libs` -lgtk -lgdk -lmikmod
 # Uncomment the following if compiling with GTK 2 support:
-LDFLAGS = `wx-config --libs` -lgtk-x11-2.0 -lgdk-x11-2.0 -lmikmod
+LDFLAGS = `wx24-config --libs` -lmikmod
 
 # Use these LDFLAGS and STATICLIBS for static building:
 #STATICLIBS = /usr/local/lib/libmikmod.a /usr/local/lib/libwx_gtk2-2.4.a
@@ -39,7 +39,7 @@ MYCODEDIR := .
 # Uncomment the following if compiling with GTK 1.2 support:
 #SEARCHDIRS := -I- -I${MYCODEDIR} -I${HUGOSOURCEDIR} -I${MIKMODINCLUDEDIR} -I${CXXINCLUDEDIR}
 # Uncomment the following if compiling with GTK 2 support:
-SEARCHDIRS := -I- -I${MYCODEDIR} -I${HUGOSOURCEDIR} -I${MIKMODINCLUDEDIR} -I${CXXINCLUDEDIR} -I/usr/include/gtk-2.0
+SEARCHDIRS := -I${MYCODEDIR} -I${HUGOSOURCEDIR} -I${MIKMODINCLUDEDIR}
 
 
 # Hopefully nothing below here will need to be changed:
@@ -52,17 +52,19 @@ TOUCHHEADERS := ${MYCODEDIR}/*.h
 
 # C
 
-CC     := gcc
+#CC     := gcc
 # Debugging:
 #CFLAGS  = ${DEPENDFLAGS} -D__WXGTK__ -DWXWINDOWS -DNO_WXCARET -g3 -Wall `wx-config --cflags`
 # Release build:
-CFLAGS  = ${DEPENDFLAGS} -D__WXGTK__ -DWXWINDOWS -DNO_WXCARET -O2 -Wall `wx-config --cflags`
+CPPFLAGS+=${DEPENDFLAGS} -D__WXGTK__ -DWXWINDOWS -DNO_WXCARET
+HUGO_CFLAGS=-O2 -Wall `wx24-config --cflags`
+CFLAGS  += ${HUGO_CFLAGS}
 
 # C++
 
-CXX      := g++
+#CXX      := g++
 #CXXFLAGS  = ${DEPENDFLAGS}
-CXXFLAGS = ${CFLAGS} -fno-rtti
+CXXFLAGS += ${HUGO_CFLAGS} -fno-rtti
 
 %.o : %.cpp
 	${CXX} ${CPPFLAGS} -c $< ${CXXFLAGS}
@@ -72,7 +74,7 @@ CXXFLAGS = ${CFLAGS} -fno-rtti
 
 # C preprocessor
 
-CPPFLAGS = 
+#CPPFLAGS = 
 
 # linker