$NetBSD: patch-ac,v 1.5 2002/10/08 12:38:26 jlam Exp $

--- Imakefile.orig	Fri May 13 06:04:38 1994
+++ Imakefile
@@ -8,7 +8,7 @@
 XCOMM
 
 XCOMM def/undef USE_MOTIF there if you want Pixmap to use Motif or not.
-#undef USE_MOTIF
+#define USE_MOTIF
 #ifdef HPArchitecture
 CCOPTIONS = -Aa -D_HPUX_SOURCE -DNO_EDITRES
 #if ProjectX > 4
@@ -21,22 +21,20 @@
 #endif
 
 XCOMM Where you have rgb.txt
-RGBTXT = $(LIBDIR)/rgb.txt
+RGBTXT = ${X11BASE}/lib/X11/rgb.txt
 
 XCOMM LUCS extra variable for where bitmaps go
 PIXMAPDIR = $(LIBDIR)/Pixmap
 
 XCOMM Specify here your Xpm installation directories
-        XPM_INCLUDEDIR = /usr/local/include
-        XPM_LIBDIR = $(LIBDIR)/xpm
-        XPM_INCLUDEDIR = /net/koala/include
-        XPM_LIBDIR = /net/koala/lib/sun4
-        EXTRA_INCLUDES = $(R5EXT) -I. -I.. -I$(XPM_INCLUDEDIR) -I/usr/include/$(MOTIFVER)
+        XPM_INCLUDEDIR = $(LOCALBASE)/include
+        XPM_LIBDIR = $(USRLIBDIR)
+        EXTRA_INCLUDES = $(R5EXT) -I. -I.. -I$(XPM_INCLUDEDIR) -I$(MOTIFBASE)/include
 
 #ifdef USE_MOTIF
 XCOMM Motif configuration
   LOCAL_DEFINES = $(IEEE_DEFS) $(SIGNAL_DEFINES) -D_NO_PROTO
-LOCAL_LIBRARIES = -L$(XPM_LIBDIR) -lXpm -L/usr/lib/$(MOTIFVER) -lXm $(XMULIB) $(XTOOLLIB) $(XLIB)
+LOCAL_LIBRARIES = -L$(XPM_LIBDIR) -lXpm ${MOTIFLIB} -lXm $(XMULIB) $(XTOOLLIB) $(XLIB)
         BITMAPS = MDown MFlipHoriz MFlipVert MFold  MLeft MRight MRotateLeft \
                   MRotateRight Stipple MUp
 #else
@@ -89,7 +87,7 @@
 
 Pixmap.ad: APixmap.ad
 	@echo Pixmap compiled with Athena.
-	@sed -e "s#@PIXMAPDIR@#$(PIXMAPDIR)/#g" <APixmap.ad >Pixmap.ad
+	@sed -e "s#@PIXMAPDIR@#$(PIXMAPDIR)/#g" -e "s/^Pixmap//" <APixmap.ad >Pixmap.ad
 #endif
 
 dotpixmap: $(RGBTXT)