54 lines
1.4 KiB
Text
54 lines
1.4 KiB
Text
$NetBSD: patch-aa,v 1.2 2001/11/01 09:36:34 tron Exp $
|
|
|
|
--- Makefile.orig Thu Dec 3 16:33:58 1998
|
|
+++ Makefile Thu Nov 1 10:35:05 2001
|
|
@@ -2,22 +2,21 @@
|
|
# Makefile,v 1.8 1998/12/03 15:33:58 rneswold Exp
|
|
#
|
|
|
|
-PREFIX=/usr/local
|
|
-MANDIR=${PREFIX}/man
|
|
-BINDIR=${PREFIX}/bin
|
|
-
|
|
-LIBDIR = -L/usr/X11R6/lib -L/usr/local/lib
|
|
+LIBDIR = -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib
|
|
LIBS = -lXpm -lXext -lX11 -lkvm
|
|
OBJS = main.o if.o wmgeneral.o
|
|
-INCDIR = -I${X11BASE}/include
|
|
+INCDIR = -I${X11BASE}/include -I${LOCALBASE}/include
|
|
|
|
.c.o :
|
|
- cc -c -g -O1 -Wall ${INCDIR} $< -o $*.o
|
|
+ ${CC} -c ${CFLAGS} ${INCDIR} $< -o $*.o
|
|
+
|
|
+all :: wminet
|
|
|
|
-all :: wmnet
|
|
+wminet : $(OBJS)
|
|
+ ${CC} ${LDFLAGS} -o wminet $(OBJS) $(LIBDIR) $(LIBS) ${INCDIR}
|
|
|
|
-wmnet : $(OBJS)
|
|
- cc -o wmnet $(OBJS) $(LIBDIR) $(LIBS) ${INCDIR}
|
|
+wminet.1 : wmnet.1
|
|
+ sed -e 's/wmnet/wminet/g' wmnet.1 > wminet.1
|
|
|
|
main.o : wmnet-mask.xbm wmnet-master.xpm wmnet.h wmgeneral.h
|
|
|
|
@@ -26,12 +25,12 @@
|
|
wmgeneral.o : wmgeneral.c wmgeneral.h
|
|
|
|
clean :
|
|
- rm -f $(OBJS) wmnet
|
|
+ rm -f $(OBJS) wminet
|
|
|
|
-install.man : wmnet.1
|
|
- install -c -m 644 -o man -g man wmnet.1 ${MANDIR}/man1
|
|
+install.man : wminet.1
|
|
+ install -c -m 644 -o root -g wheel wminet.1 ${PREFIX}/man/man1
|
|
|
|
-install.bin : wmnet
|
|
- install -s -c -m 2555 -o bin -g kmem wmnet ${BINDIR}
|
|
+install.bin : wminet
|
|
+ install -s -c -m 2555 -o bin -g kmem wminet ${PREFIX}/bin
|
|
|
|
install : install.bin install.man
|