[Pkg-wmaker-commits] [wmbiff] 07/14: An FHS fix for wmbiff.c and use $(CC) in the Makefile

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to tag wmbiff_0_3_1
in repository wmbiff.

commit 77ef1c878a23cfa96b57b83633267995db1f2acd
Author: oskuro <oskuro>
Date:   Sat Jun 16 01:02:51 2001 +0000

    An FHS fix for wmbiff.c and use $(CC) in the Makefile
---
 ChangeLog              | 13 ++++++++++---
 wmbiff/Makefile        |  6 ++++--
 wmbiff/sample.wmbiffrc |  2 +-
 wmbiff/wmbiff.c        |  2 +-
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 313bdc7..98f6606 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,16 @@
-wmBiff (0.3.1)
+Sat, 16 Jun 2001 02:55:51 +0100  Jordi Mallach <jordi at sindominio.net>
+
+  * wmbiff/Makefile: replaced hardcoded `gcc' calls with $(CC).
+  * wmbiff/sample.wmbiffrc, wmbiff/wmbiff.c: replace /var/spool/mail 
+    with /var/mail, which is what the FHS mandates. All decent
+    systems should have either the directory or a symlink pointing
+    somewhere else.
+
+Wed, 16 May 2001 20:45:49 -0400  Mark Hurley <debian4tux at telocity.com>
+
   * wmbiff/charutil.c: fixed gcc-3.0 implicit warning, but including string.h
     also cleaned up other includes in same file
  
- -- Mark Hurley <debian4tux at telocity.com>  Wed, 16 May 2001 20:45:49 -0400
- 
 wmBiff (0.3.0)
   * wmbiff/Makefile:
     + added charutil.o to OBJS (Mark Hurley).
diff --git a/wmbiff/Makefile b/wmbiff/Makefile
index a513760..e55c1fb 100644
--- a/wmbiff/Makefile
+++ b/wmbiff/Makefile
@@ -4,6 +4,8 @@ prefix=/usr/local
 bindir=${prefix}/bin
 mandir=${prefix}/share/man
 CONF=/etc
+
+CC     = gcc
 LIBDIR = -L/usr/X11R6/lib
 LIBS   = -lXpm -lXext -lX11
 CFLAGS = -O2 -Wall
@@ -28,7 +30,7 @@ INSTALL_FILE 	= $(INSTALL) -p -o root -g root -m 644
 
 
 .c.o:
-	gcc $(CFLAGS) $(EXTRAFLAGS) -c $< -o $*.o
+	$(CC) $(CFLAGS) $(EXTRAFLAGS) -c $< -o $*.o
 
 all: wmbiff-master.xpm wmbiff
 
@@ -36,7 +38,7 @@ wmbiff-master.xpm:
 	ln -s wmbiff-master-led.xpm wmbiff-master.xpm
 
 wmbiff:	$(OBJS)
-	gcc $(CFLAGS) $(EXTRAFLAGS) -o wmbiff -lX11 -lnsl $^ $(LIBDIR) $(LIBS)
+	$(CC) $(CFLAGS) $(EXTRAFLAGS) -o wmbiff -lX11 -lnsl $^ $(LIBDIR) $(LIBS)
 
 clean:
 	for i in $(OBJS) ; do \
diff --git a/wmbiff/sample.wmbiffrc b/wmbiff/sample.wmbiffrc
index 0c88168..fff8193 100644
--- a/wmbiff/sample.wmbiffrc
+++ b/wmbiff/sample.wmbiffrc
@@ -9,7 +9,7 @@ label.0=Spool
 # Path to mailbox for UNIX-style mailboxes,
 # or pop3:user:password at mailserver[:port] for POP3 accounts
 # port are optional, default - 110
-path.0=/var/spool/mail/gb
+path.0=/var/mail/gb
 
 # Command, which executed on new mail arrival, or special keyword 'beep'
 #notify.0=beep
diff --git a/wmbiff/wmbiff.c b/wmbiff/wmbiff.c
index 5fa5760..f1ba3e5 100644
--- a/wmbiff/wmbiff.c
+++ b/wmbiff/wmbiff.c
@@ -76,7 +76,7 @@ void init_biff(char *uconfig_file)
 	if ((m = getenv("MAIL")) != NULL) {
 		strcpy(mbox[0].path, m);
 	} else if ((m = getenv("USER")) != NULL) {
-		strcpy(mbox[0].path, "/var/spool/mail/");
+		strcpy(mbox[0].path, "/var/mail/");
 		strcat(mbox[0].path, m);
 	}
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmbiff.git