--- Makefile.orig	2002-12-07 23:49:52.000000000 +0100
+++ Makefile	2003-08-23 13:26:22.000000000 +0200
@@ -1,14 +1,14 @@
-CPPFLAGS=-W -Wall -O2 -finline-functions
+CPPFLAGS=${CXXFLAGS} -I${LOCALBASE}/include
 #CPPFLAGS=-O0 -W -Wall
 DEBUG=-g
 
 all: png2ico
 
 png2ico: png2ico.cpp
-	g++ $(CPPFLAGS) $(DEBUG) -o $@ $< -lpng -lz -lm
+	$(CXX) $(CPPFLAGS) $(DEBUG) -o $@ $? -L${LOCALBASE}/lib -lpng -lz -lm
 
 doc/png2ico.txt: doc/png2ico.1
-	man $< |sed  -e $$'s/.\b\\(.\\)/\\1/g' -e 's/\(.*\)/\1'$$'\r/' >$@
+	man $? |sed  -e $$'s/.\b\\(.\\)/\\1/g' -e 's/\(.*\)/\1'$$'\r/' >$@
 
 release: clean png2ico doc/png2ico.txt
 	echo $$'\nHAVE YOU UPDATED VERSION IN BOTH THE UNIX AND THE WINDOWS BUILD?\n'
