$NetBSD: patch-ac,v 1.3 2005/06/14 18:10:37 jlam Exp $

--- lib/Imakefile.orig	1998-03-19 14:50:59.000000000 -0500
+++ lib/Imakefile
@@ -34,7 +34,7 @@ XCOMM default locations
 #define XpmLibDir $(USRLIBDIR)
 #endif
 #ifndef XpmIncDir
-#define XpmIncDir $(INCDIR)
+#define XpmIncDir $(PROJECTROOT)/include
 #endif
 
 XCOMM If not already set in top dir,
@@ -55,7 +55,7 @@ REQUIREDLIBS = $(XLIB)
 #endif
 
 XCOMM on Dec Alpha we need to define the following to build the shared library
-#ifdef AlphaArchitecture
+#if defined(AlphaArchitecture) && defined(ModernOSF1)
 REQUIREDLIBS = $(LDPRELIB) $(XLIB)
 SO_REQLIBS = -lX11 -lc
 #endif
@@ -104,13 +104,15 @@ HEADERS = xpm.h
 	 CrBufFrI.c CrDatFrP.c CrPFrBuf.c RdFToI.c WrFFrI.c \
 	 CrBufFrP.c CrIFrBuf.c CrPFrDat.c RdFToP.c WrFFrP.c \
 	 CrDatFrI.c CrIFrDat.c RdFToDat.c WrFFrDat.c \
-	 Attrib.c CrIFrP.c CrPFrI.c Image.c Info.c RdFToBuf.c WrFFrBuf.c
+	 Attrib.c CrIFrP.c CrPFrI.c Image.c Info.c RdFToBuf.c WrFFrBuf.c \
+	 s_popen.c
 
   OBJS = data.o create.o misc.o rgb.o scan.o parse.o hashtab.o \
 	 CrBufFrI.o CrDatFrP.o CrPFrBuf.o RdFToI.o WrFFrI.o \
 	 CrBufFrP.o CrIFrBuf.o CrPFrDat.o RdFToP.o WrFFrP.o \
 	 CrDatFrI.o CrIFrDat.o RdFToDat.o WrFFrDat.o \
-	 Attrib.o CrIFrP.o CrPFrI.o Image.o Info.o RdFToBuf.o WrFFrBuf.o
+	 Attrib.o CrIFrP.o CrPFrI.o Image.o Info.o RdFToBuf.o WrFFrBuf.o \
+	 s_popen.o
 
        INCLUDES = -I.
        LINTLIBS = $(LINTXTOLL) $(LINTXLIB)