summaryrefslogtreecommitdiff
path: root/mail/wmbiff/patches/patch-aa
blob: 4db2657843c9180ca5e190c1e30a180e607df453 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
$NetBSD: patch-aa,v 1.2 2001/07/04 19:04:16 magick Exp $

--- Makefile.orig	Sun Jun 24 20:31:25 2001
+++ Makefile
@@ -2,7 +2,9 @@
 WMBIFF_VERSION="0.3.1"
 DESTDIR=
-prefix=/usr/local
+prefix=${PREFIX}
 bindir=${prefix}/bin
-mandir=${prefix}/share/man
+mandir=${prefix}/man
+datadir=${prefix}/share/examples/wmbiff
+
 CONF=/etc
 
@@ -10,7 +12,7 @@
 LIBDIR = -L/usr/X11R6/lib
 LIBS   = -lXpm -lXext -lX11
-CFLAGS = -O2 -Wall
 #CFLAGS = -g -Wall -pedantic 
-
+#CFLAGS += -Wall -I${PREFIX}/include -I${X11BASE}/include
+CFLAGS+= -I${X11BASE}/include
 EXTRAFLAGS = -DWMBIFF_VERSION='$(WMBIFF_VERSION)'
 #EXTRAFLAGS += -DDEBUG_POP3 -DDEBUG_IMAP4 -DDEBUG_LICQ \
@@ -25,12 +27,6 @@
 	charutil.o
 
-INSTALL = /usr/bin/install
-INSTALL_DIR	= $(INSTALL) -p -d -o root -g root -m 755
-INSTALL_PROGRAM	= $(INSTALL) -p -o root -g root -m 755
-INSTALL_FILE 	= $(INSTALL) -p -o root -g root -m 644
-
-
 .c.o:
-	$(CC) $(CFLAGS) $(EXTRAFLAGS) -c $< -o $*.o
+	${CC} ${CFLAGS} $(EXTRAFLAGS) -c $< -o $*.o
 
 all: wmbiff-master.xpm wmbiff
@@ -40,5 +36,5 @@
 
 wmbiff:	$(OBJS)
-	$(CC) $(CFLAGS) $(EXTRAFLAGS) -o wmbiff -lX11 -lnsl $^ $(LIBDIR) $(LIBS)
+	$(CC) ${CFLAGS} ${LDFLAGS} $(EXTRAFLAGS) -o wmbiff -lX11 $^ $(LIBDIR) $(LIBS)
 
 clean:
@@ -51,10 +47,9 @@
 
 install: wmbiff
-	$(INSTALL_DIR) $(DESTDIR)$(bindir)
-	$(INSTALL_DIR) $(DESTDIR)$(mandir)/man1
-	$(INSTALL_DIR) $(DESTDIR)$(mandir)/man5
-	$(INSTALL_PROGRAM) wmbiff $(DESTDIR)$(bindir)
-	$(INSTALL_FILE) wmbiff.1 $(DESTDIR)$(mandir)/man1
-	$(INSTALL_FILE) wmbiffrc.5 $(DESTDIR)$(mandir)/man5
+	${BSD_INSTALL_PROGRAM} wmbiff $(DESTDIR)$(bindir)
+	${BSD_INSTALL_MAN} wmbiff.1 $(DESTDIR)$(mandir)/man1
+	${BSD_INSTALL_MAN} wmbiffrc.5 $(DESTDIR)$(mandir)/man5
+	${BSD_INSTALL_DATA_DIR} $(DESTDIR)/$(datadir)
+	${BSD_INSTALL_DATA} sample.wmbiffrc $(DESTDIR)$(datadir)/
 
 # CODING STYLE AND INDENTATION [2001-Mar-12]: