From 2db390d2e24450576bda2b6117e33cdf7eeb7d08 Mon Sep 17 00:00:00 2001
From: dfs <dfs>
Date: Sat, 17 Jan 1998 04:50:50 +0000
Subject: [PATCH] -- Made check for TM_IN_SYS_TIME_H

---
 src/Makefile.in | 20 ++++++++++++++++++--
 src/files.c     |  7 ++++++-
 src/funcs.c     |  7 ++++++-
 src/main.c      |  4 ++--
 4 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/src/Makefile.in b/src/Makefile.in
index 6c631cd8..a0971e83 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,6 +1,6 @@
 # Makefile.in for REMIND
 # 
-# $Id: Makefile.in,v 1.2 1998-01-17 03:58:26 dfs Exp $
+# $Id: Makefile.in,v 1.3 1998-01-17 04:50:50 dfs Exp $
 
 VERSION= 03.00.18
 SHELL= /bin/sh
@@ -11,6 +11,15 @@ mandir=@mandir@
 bindir=@bindir@
 datadir=@datadir@
 
+INSTALL=@INSTALL@
+INSTALL_PROGRAM=@INSTALL_PROGRAM@
+INSTALL_DATA=@INSTALL_DATA@
+
+PROGS=		remind rem2ps
+SCRIPTS=	../scripts/kall ../scripts/rem ../scripts/tkremind
+MANS=		../man/kall.1 ../man/rem.1 ../man/rem2ps.1 ../man/remind.1 \
+		../man/tkremind.1
+
 .SUFFIXES:
 .SUFFIXES: .c .o
 
@@ -22,6 +31,9 @@ REMINDOBJS= $(REMINDSRCS:.c=.o)
 
 all: remind rem2ps
 
+test: remind
+	sh ../tests/test-rem
+
 .c.o:
 	@CC@ -c @CFLAGS@ @DEFS@ -DUNIX $*.c
 
@@ -31,8 +43,12 @@ rem2ps: rem2ps.o
 remind: $(REMINDOBJS)
 	@CC@ @LDFLAGS@ -o remind $(REMINDOBJS) @LIBS@
 
+install: all
+	$(INSTALL_PROGRAM) $(PROGS) $(SCRIPTS) $(bindir)
+	$(INSTALL_DATA) $(MANS) $(mandir)
+
 clean:
-	rm -f *.o *~ core *.bak
+	rm -f *.o *~ core *.bak $(PROGS)
 
 clobber:
 	rm -f *.o *~ remind rem2ps test.out core *.bak
diff --git a/src/files.c b/src/files.c
index 1f65bd0d..9231767d 100644
--- a/src/files.c
+++ b/src/files.c
@@ -12,14 +12,19 @@
 /***************************************************************/
 
 #include "config.h"
-static char const RCSID[] = "$Id: files.c,v 1.2 1998-01-17 03:58:28 dfs Exp $";
+static char const RCSID[] = "$Id: files.c,v 1.3 1998-01-17 04:50:51 dfs Exp $";
 
 #include <stdio.h>
 
 #include <string.h>
 #include <ctype.h>
 #include <sys/stat.h>
+
+#ifdef TM_IN_SYS_TIME
+#include <sys/time.h>
+#else
 #include <time.h>
+#endif
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
diff --git a/src/funcs.c b/src/funcs.c
index ecb93ffb..01a1ba1c 100644
--- a/src/funcs.c
+++ b/src/funcs.c
@@ -11,7 +11,7 @@
 /***************************************************************/
 
 #include "config.h"
-static char const RCSID[] = "$Id: funcs.c,v 1.2 1998-01-17 03:58:29 dfs Exp $";
+static char const RCSID[] = "$Id: funcs.c,v 1.3 1998-01-17 04:50:51 dfs Exp $";
 
 #include <stdio.h>
 
@@ -40,7 +40,12 @@ static char const RCSID[] = "$Id: funcs.c,v 1.2 1998-01-17 03:58:29 dfs Exp $";
 #endif
 
 #include <sys/stat.h>
+
+#ifdef TM_IN_SYS_TIME
+#include <sys/time.h>
+#else
 #include <time.h>
+#endif
 
 #if defined(__MSDOS__) || defined(__OS2__)
 #include <io.h>
diff --git a/src/main.c b/src/main.c
index 4d6da570..aa663043 100644
--- a/src/main.c
+++ b/src/main.c
@@ -11,7 +11,7 @@
 /***************************************************************/
 
 #include "config.h"
-static char const RCSID[] = "$Id: main.c,v 1.2 1998-01-17 03:58:30 dfs Exp $";
+static char const RCSID[] = "$Id: main.c,v 1.3 1998-01-17 04:50:52 dfs Exp $";
 
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
@@ -40,7 +40,7 @@ static char const RCSID[] = "$Id: main.c,v 1.2 1998-01-17 03:58:30 dfs Exp $";
 #include <time.h>
 #include <sys/time.h>
 #else
-#ifdef HAVE_SYS_TIME_H
+#if defined(HAVE_SYS_TIME_H) || defined (TIME_WITH_SYS_TIME)
 #include <sys/time.h>
 #else
 #include <time.h>