$NetBSD: patch-ac,v 1.2 2000/02/05 15:58:29 wiz Exp $

Index: Imakefile
===================================================================
RCS file: /home/siren/src/tvtwm/Imakefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Imakefile	1999/08/08 05:47:57	1.2
+++ Imakefile	1999/08/08 05:56:46	1.3
@@ -51,14 +51,14 @@
 XCOMM                                 <cross@eng.umd.edu>
 XCOMM
 XCOMM   Also note, if you install your libXpm.a in a strange place, you'll
-XCOMM have to adjust $(XPMLIB) below.  You may also have to change the
+XCOMM have to adjust $(XPM_LIB) below.  You may also have to change the
 XCOMM include path of the compile, so that the code can include from
 XCOMM <X11/xpm.h>.
 XCOMM
 
-         XPMLIB = -lXpm
-        XPM_DEF = -DXPM
-XCOMM    XLOADIM_DEF = -DXLOADIMAGE=\"$(BINDIR)/xloadimage\"
+XPM_LIB = -lXpm
+XPM_DEF = -DXPM
+XLOADIM_DEF = -DXLOADIMAGE=\"$(BINDIR)/xloadimage\"
 
 XCOMM   Ultrix doesn't have a mkstemp in libc...
 XCOMM   Sys V doesn't seem to either...
@@ -71,7 +71,7 @@
 
 XCOMM   Various defines to pass into twm.c
 
-#if DefaultToM4
+#ifdef DefaultToM4
          M4_DEF = -DM4_DEFAULT
 #endif
 #ifdef No_waitpid
@@ -79,7 +79,7 @@
 #endif
        TWM_DEFS = $(XLOADIM_DEF) $(M4_DEF) $(WAITPID_DEF)
 
-LOCAL_LIBRARIES = $(XMULIB) $(EXTENSIONLIB) $(XPMLIB) $(XLIB)
+LOCAL_LIBRARIES = $(XMULIB) $(EXTENSIONLIB) $(XPM_LIB) $(XLIB)
        LINTLIBS = $(LINTXMU) $(LINTEXTENSIONLIB) $(LINTXLIB)
         DEFINES = -DSHAPE $(RELEASE_DEFINES) $(LOCAL_DEFINES) $(SIGNAL_DEFINES)
 
@@ -97,7 +97,7 @@
 
 SpecialObjectRule(parse.o,NullParameter,'-DSYSTEM_INIT_FILE="'$(TWMDIR)'/system.tvtwmrc"')
 SpecialObjectRule(vdt.o,NullParameter,$(XLOADIM_DEF))
-SpecialObjectRule(LocPixmap.o,NullParameter,'-DBITMAPDIR="$(INCDIR)/bitmaps"')
+SpecialObjectRule(LocPixmap.o,NullParameter,'-DBITMAPDIR="$(INCDIR)/X11/bitmaps"')
 SpecialObjectRule(twm.o,NullParameter,$(TWM_DEFS))
 
 #if defined(UltrixArchitecture) || defined(AlphaArchitecture)