--- Imakefile.orig	Sun Nov  6 16:50:22 2005
+++ Imakefile	Tue Dec 13 13:43:21 2005
@@ -15,15 +15,15 @@
 DOCHTMLDIR=/X11R6/lib/X11/doc/html
 
 XCOMM Do you want to use the libxpm bug work around ? Comment out if not
-XPMWORKAROUND=-DXPMBUG
+XCOMM XPMWORKAROUND=-DXPMBUG
 
 XCOMM Default external utilities :
 XCOMM PostScript viewer, image viewer, HTML viewer, Print command
 XCOMM default editor, MIDI player
 
-PS_VIEWER="gv -noantialias"
-IM_VIEWER="display -background gray84"
-HTML_VIEWER="dillo"
+PS_VIEWER="gv --noantialias"
+IM_VIEWER="qiv"
+HTML_VIEWER="firefox"
 PRINT_CMD="lpr -Plp"
 EDITOR="emx -fn 9x15"
 MIDIPLAYER="timidity -ig"
@@ -63,7 +63,7 @@
 XCOMM Solaris, Linux
 
 ZLIBDIR=-L/usr/lib
-CCOPTIONS=-O $(XPMWORKAROUND) -DZLIB -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\" \
+CCOPTIONS=-I/usr/local/include $(XPMWORKAROUND) -DZLIB -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\" \
   -DPS_VIEWER=\"$(PS_VIEWER)\" -DIM_VIEWER=\"$(IM_VIEWER)\" \
   -DSVG_VIEWER=\"$(SVG_VIEWER)\" -DSVG_CONVERT=\"$(SVG_CONVERT)\" \
   -DHTML_VIEWER=\"$(HTML_VIEWER)\" -DPRINT_CMD=\"$(PRINT_CMD)\" \
@@ -74,7 +74,7 @@
 SRCS=explorer.c image.c xrmap.c
 OBJS=explorer.o image.o xrmap.o
 
-LOCAL_LIBRARIES=$(XLIB) $(XPMLIB) $(ZLIBDIR) -ljpeg -lpng -lz -lm 
+LOCAL_LIBRARIES=$(XLIB) $(XPMLIB) $(ZLIBDIR) -L/usr/local/lib -ljpeg -lpng -lz -lm 
 DEPLIBS=		# I don't know what I'm doing, and I hate imake!
 
 numdefs.h:
@@ -93,8 +93,6 @@
 all::
 	cd editkit ; xmkmf ; make DESTDIR=$(DESTDIR)
 	cd earthview ; make DESTDIR=$(DESTDIR)
-	strip xrmap ; ls -al xrmap
-	@cat EXTRADATA
 
 
 install:: all install.man
@@ -120,7 +118,6 @@
 	cp -fR rc $(DESTDIR)$(SHAREDIR)
 	cd editkit ; xmkmf ; make install DESTDIR=$(DESTDIR)
 	cd earthview ; make install DESTDIR=$(DESTDIR)
-	@cat EXTRADATA
 
 clean::
 	cd tools ; make clean DESTDIR=$(DESTDIR)