$NetBSD: patch-aa,v 1.1.1.1 1999/11/25 08:17:15 sakamoto Exp $ --- Makefile.orig Sat Oct 16 19:00:08 1999 +++ Makefile Thu Nov 25 11:02:25 1999 @@ -2,25 +2,42 @@ MAINVERSION = '"6.03"' GUIVERSION = '".06"' -LIBDIR = '"/usr/local/lib/Ngraph"' -INSTALLDIR = /usr/local/lib/Ngraph -BINDIR = /usr/local/bin +LIBDIR = '"${PREFIX}/libexec/Ngraph"' +INSTALLDIR = ${PREFIX}/libexec/Ngraph +BINDIR = ${PREFIX}/bin # # ############################################################################### # -# Linux + Motif 2.1 (RedHat) [static link] +# NetBSD + lesstif [static link] # CC = gcc -CCOPTION = -O2 -m486 -MAKE = make +CCOPTION = -O2 +MAKE = ${GMAKE} AR = ar RANLIB = ranlib STRIP = strip -DEFS = -DJAPANESE -PLATFORM = '"for X11 [Linux(glibc2)+Motif2.1]"' +DEFS = ${MOTIF_DEFS} +PLATFORM = '"for X11 [NetBSD + LessTif]"' +X11INCLUDE = -I${X11BASE}/include -I../combo +STATICLINK = ./combo/ComboBox.o ${X11BASE}/lib/libXm.a +X11LIB = ${LDFLAGS} -lm -lXext -lXt -lXp -lX11 -lICE -lSM +# +# +############################################################################### +# +# Linux + Motif 2.1 (RedHat) [static link] +# +#CC = gcc +#CCOPTION = -O2 -m486 +#MAKE = make +#AR = ar +#RANLIB = ranlib +#STRIP = strip +#DEFS = -DJAPANESE +#PLATFORM = '"for X11 [Linux(glibc2)+Motif2.1]"' #PLATFORM = '"for X11 [Linux(libc5)+Motif2.1]"' -X11INCLUDE = -I/usr/X11R6/include -STATICLINK = /usr/X11R6/lib/libXm.a -X11LIB = -L/usr/X11R6/lib -lm -lXext -lXt -lXp -lX11 -lICE -lSM +#X11INCLUDE = -I/usr/X11R6/include +#STATICLINK = /usr/X11R6/lib/libXm.a +#X11LIB = -L/usr/X11R6/lib -lm -lXext -lXt -lXp -lX11 -lICE -lSM # # @@ -155,4 +172,5 @@ all: + (cd combo; $(CC) -c $(X11INCLUDE) ComboBox.c) (cd src; $(MAKE) kern.a) (cd x11; $(MAKE) main.o) @@ -197,4 +215,5 @@ - (cd x11drive; $(MAKE) clean) - (cd x11addin; $(MAKE) clean) + - (cd combo; rm ComboBox.o) cleanbackup: