1 $NetBSD: patch-ac,v 1.5 2002/10/08 12:38:26 jlam Exp $
3 --- Imakefile.orig 1994-05-13 11:04:38.000000000 +0000
5 @@ -8,7 +8,7 @@ XCOMM Created: April 20, 1991.
8 XCOMM def/undef USE_MOTIF there if you want Pixmap to use Motif or not.
12 CCOPTIONS = -Aa -D_HPUX_SOURCE -DNO_EDITRES
14 @@ -21,22 +21,20 @@ R5EXT = -I.
17 XCOMM Where you have rgb.txt
18 -RGBTXT = $(LIBDIR)/rgb.txt
21 XCOMM LUCS extra variable for where bitmaps go
22 PIXMAPDIR = $(LIBDIR)/Pixmap
24 XCOMM Specify here your Xpm installation directories
25 - XPM_INCLUDEDIR = /usr/local/include
26 - XPM_LIBDIR = $(LIBDIR)/xpm
27 - XPM_INCLUDEDIR = /net/koala/include
28 - XPM_LIBDIR = /net/koala/lib/sun4
29 - EXTRA_INCLUDES = $(R5EXT) -I. -I.. -I$(XPM_INCLUDEDIR) -I/usr/include/$(MOTIFVER)
30 + XPM_INCLUDEDIR = $(LOCALBASE)/include
31 + XPM_LIBDIR = $(USRLIBDIR)
32 + EXTRA_INCLUDES = $(R5EXT) -I. -I.. -I$(XPM_INCLUDEDIR) -I$(MOTIFBASE)/include
35 XCOMM Motif configuration
36 LOCAL_DEFINES = $(IEEE_DEFS) $(SIGNAL_DEFINES) -D_NO_PROTO
37 -LOCAL_LIBRARIES = -L$(XPM_LIBDIR) -lXpm -L/usr/lib/$(MOTIFVER) -lXm $(XMULIB) $(XTOOLLIB) $(XLIB)
38 +LOCAL_LIBRARIES = -L$(XPM_LIBDIR) -lXpm ${MOTIFLIB} -lXm $(XMULIB) $(XTOOLLIB) $(XLIB)
39 BITMAPS = MDown MFlipHoriz MFlipVert MFold MLeft MRight MRotateLeft \
40 MRotateRight Stipple MUp
42 @@ -70,8 +68,8 @@ LOCAL_LIBRARIES = -L$(XPM_LIBDIR) -lXpm
44 ComplexProgramTarget(pixmap)
45 InstallAppDefaults(Pixmap)
46 -MakeDirectories(install, $(PIXMAPDIR))
47 -InstallMultipleFlags($(BITMAPS), $(PIXMAPDIR), $(INSTDATFLAGS))
48 +MakeDirectories(install,$(PIXMAPDIR))
49 +InstallMultipleFlags($(BITMAPS),$(PIXMAPDIR),$(INSTDATFLAGS))
53 @@ -89,7 +87,7 @@ NamedMakeSubdirs(Xgnu, SelFile)
56 @echo Pixmap compiled with Athena.
57 - @sed -e "s#@PIXMAPDIR@#$(PIXMAPDIR)/#g" <APixmap.ad >Pixmap.ad
58 + @sed -e "s#@PIXMAPDIR@#$(PIXMAPDIR)/#g" -e "s/^Pixmap//" <APixmap.ad >Pixmap.ad