--- Makefile.orig	Sun Jul  1 12:06:18 2007
+++ Makefile	Fri Jul 20 12:07:40 2007
@@ -20,7 +20,6 @@
 
 # Where to install things:
 
-PREFIX=/usr/local
 
 
 # Program:
@@ -37,7 +36,7 @@
 # Docs and man page:
 
 DOC_PREFIX=$(PREFIX)/share/doc/tuxpaint-config/
-MAN_PREFIX=$(PREFIX)/share/man/
+MAN_PREFIX=$(PREFIX)/man/
 
 
 # Tux Paint's 'System-wide' Config file:
@@ -77,7 +76,7 @@
 PAPER_LIB=-lpaper
 
 # Default CFLAGS:
-CFLAGS=-O2 -Wall
+CFLAGS+=-O2 -Wall
 
 # The entire set of CFLAGS:
 ALL_CFLAGS=$(CFLAGS) $(FLTK_CFLAGS) -DDATA_PREFIX=\"$(DATA_PREFIX)\" \
@@ -147,8 +146,7 @@
 # to do this as superuser ("root"))
 
 install:	install-bin install-data install-man install-doc \
-		install-gnome install-kde install-kde-icons \
-		install-icon install-gettext
+		install-gettext
 	@echo
 	@echo "All done! Now (preferably NOT as 'root' superuser),"
 	@echo "you can type the command 'tuxpaint-config' to run the"
@@ -238,9 +236,6 @@
 	@install -d $(ICON_PREFIX)
 	@cp data/images/icon.png $(ICON_PREFIX)tuxpaint-config.png
 	@chmod 644 $(ICON_PREFIX)tuxpaint-config.png
-	@install -d $(X11_ICON_PREFIX)
-	@cp data/images/icon32x32.xpm $(X11_ICON_PREFIX)tuxpaint-config.xpm
-	@chmod 644 $(X11_ICON_PREFIX)tuxpaint-config.xpm
 
 
 # Install the program:
@@ -307,7 +302,7 @@
 	@echo Linking
 	@$(CXX) $(ALL_CFLAGS) -o tuxpaint-config obj/tuxpaint-config.o 	\
 			obj/tuxpaint-config2.o obj/defaults.o $(ARCH_LIBS) \
-			$(FLTK_LIBS) $(ARCH_LINKS) $(PAPER_LIB)
+			$(FLTK_LIBS) $(ARCH_LINKS) $(PAPER_LIB) -lintl
 
 
 # Build the object for the program!