diff -Naur wfdb-10.1.4/Makefile wfdb-10.1.5/Makefile
--- wfdb-10.1.4/Makefile	Mon Jun  5 23:33:05 2000
+++ wfdb-10.1.5/Makefile	Wed Jun  7 00:12:25 2000
@@ -39,12 +39,12 @@
 # create source archives, type `make tarballs';  or to make a binary archive,
 # type `make bin-tarball'.  Making archives requires PGP, gzip, and GNU tar).
 # file: version.def		G. Moody	24 May 2000
-
+#				Last revised:	6 June 2000
 # Each release of the WFDB Software Package is identified by a three-part
 # version number, defined here:
 MAJOR = 10
 MINOR = 1
-RELEASE = 4
+RELEASE = 5
 VERSION = $(MAJOR).$(MINOR).$(RELEASE)
 
 # VDEFS is the set of C compiler options needed to set version number variables
@@ -219,7 +219,7 @@
 	cd wave-doc; $(MAKE) clean
 	cd waverc;   $(MAKE) clean
 	cd wview;    $(MAKE) -f clean
-	rm -f *~ config.cache
+	rm -f *~ conf/*~ config.cache
 
 # 'make config.cache': check configuration
 config.cache:
diff -Naur wfdb-10.1.4/Makefile.tpl wfdb-10.1.5/Makefile.tpl
--- wfdb-10.1.4/Makefile.tpl	Mon Jun  5 17:49:29 2000
+++ wfdb-10.1.5/Makefile.tpl	Thu Jun  8 00:40:40 2000
@@ -1,5 +1,5 @@
 # file: Makefile.tpl		G. Moody		24 May 2000
-#
+#				Last revised:		8 June 2000
 # This section of the Makefile should not need to be changed.
 
 # ARCH specifies the type of CPU and the operating system (e.g., 'i686-Linux').
@@ -36,7 +36,7 @@
 	cd psd;      $(MAKE) uninstall
 	cd convert;  $(MAKE) uninstall
 	cd data;     $(MAKE) uninstall
-	./uninstall $(WFDBROOT)
+	./uninstall.sh $(WFDBROOT)
 
 # 'make clean': remove binaries, other cruft from source directories
 clean:
@@ -52,7 +52,7 @@
 	cd wave-doc; $(MAKE) clean
 	cd waverc;   $(MAKE) clean
 	cd wview;    $(MAKE) -f clean
-	rm -f *~ config.cache
+	rm -f *~ conf/*~ config.cache */*.exe
 
 # 'make config.cache': check configuration
 config.cache:
diff -Naur wfdb-10.1.4/app/Makefile wfdb-10.1.5/app/Makefile
--- wfdb-10.1.4/app/Makefile	Mon Jun  5 23:33:05 2000
+++ wfdb-10.1.5/app/Makefile	Wed Jun  7 00:12:25 2000
@@ -33,12 +33,12 @@
 # type `make listing'.
 # _____________________________________________________________________________
 # file: version.def		G. Moody	24 May 2000
-
+#				Last revised:	6 June 2000
 # Each release of the WFDB Software Package is identified by a three-part
 # version number, defined here:
 MAJOR = 10
 MINOR = 1
-RELEASE = 4
+RELEASE = 5
 VERSION = $(MAJOR).$(MINOR).$(RELEASE)
 
 # VDEFS is the set of C compiler options needed to set version number variables
diff -Naur wfdb-10.1.4/app/Makefile.tpl wfdb-10.1.5/app/Makefile.tpl
--- wfdb-10.1.4/app/Makefile.tpl	Mon Jun  5 17:58:36 2000
+++ wfdb-10.1.5/app/Makefile.tpl	Wed Jun  7 18:30:53 2000
@@ -29,8 +29,8 @@
 
 # `make' or `make install':  build and install applications, clean up
 install:	all $(BINDIR) $(PSPDIR) scripts
-	cp $(XFILES) $(BINDIR)
-	cd $(BINDIR); $(SETXPERMISSIONS) $(XFILES)
+	$(SETXPERMISSIONS) $(XFILES)
+	../install.sh $(BINDIR) $(XFILES)
 	cp $(PSFILES) $(PSPDIR)
 	cd $(PSPDIR); $(SETPERMISSIONS) $(PSFILES)
 	$(MAKE) clean
@@ -42,9 +42,9 @@
 	$(SETPERMISSIONS) $(SCRIPTS)
 
 uninstall:
-	../uninstall $(PSPDIR) $(PSFILES)
-	../uninstall $(BINDIR) $(XFILES) $(SCRIPTS)
-	../uninstall $(LIBDIR)
+	../uninstall.sh $(PSPDIR) $(PSFILES)
+	../uninstall.sh $(BINDIR) $(XFILES) $(SCRIPTS)
+	../uninstall.sh $(LIBDIR)
 
 # Create directories for installation if necessary.
 $(BINDIR):
diff -Naur wfdb-10.1.4/conf/cygwin.def wfdb-10.1.5/conf/cygwin.def
--- wfdb-10.1.4/conf/cygwin.def	Wed Dec 31 19:00:00 1969
+++ wfdb-10.1.5/conf/cygwin.def	Tue Jun  6 23:56:44 2000
@@ -0,0 +1,166 @@
+# file: cygwin.def		G. Moody	6 June 2000
+#
+# This file contains default 'make' definitions for compiling the WFDB Software
+# Package under MS Windows using the free Cygwin/gcc ANSI C compiler, available
+# from http://www.cygnus.com/cygwin/.
+#
+# To use this successfully, you need to have installed Cygwin B20 or later,
+# as well as `which.exe' (which should be installed somewhere in your PATH;
+# get it from http://www.physionet.org/physiotools/utilities/which/which.exe).
+#
+# Choose a value for WFDBROOT to determine where the WFDB Software Package will
+# be installed.  One of the following is usually a reasonable choice.
+# Installing in /usr generally requires root permissions, but will be easiest
+# for future software development (no special -I or -L options will be needed
+# to compile software with the WFDB library, since the *.h files and the
+# library will be installed in the standard directories).
+WFDBROOT = /usr
+# Installing in /usr/local usually requires root permissions.  On a multi-user
+# system where it is desirable to keep the OS vendor's software separate from
+# other software, this is a good choice.  Another common choice in such cases
+# is /opt .
+# WFDBROOT = /usr/local
+# To install without root permissions, a good choice is to set WFDBROOT to the
+# name of your home directory, as in the example below (change as needed).
+# WFDBROOT = /home/frodo
+
+# If the W3C's libwww library of HTTP and FTP client code is available, and
+# you wish to compile a WFDB library with NETFILES support, set LWC to
+# 'libwww-config' (a utility supplied with libwww).  Otherwise set LWC to ':'
+# (a program that does nothing, successfully).
+LWC = libwww-config
+
+# LDLIBWWW, which is appended to LDFLAGS below, is the set of options needed
+# to link with libwww.  If libwww is not installed, or if libwfdb is a shared
+# library, LDLIBWWW can be empty (if there is a '#' immediately after the '='
+# below, the remainder of the line is ignored, so LDLIBWWW is empty in this
+# case).  Otherwise, it is generated from the output of LWC.  Note that up to
+# three passes through the option list are necessary to satisfy all
+# dependencies when linking to the static libwww libraries.
+LDLIBWWW = # `$(LWC) --libs` `$(LWC) --libs` `$(LWC) --libs`
+
+# BINDIR specifies the directory in which the applications will be installed;
+# it should be a directory in the PATH of those who will use the applications.
+BINDIR = $(WFDBROOT)/bin
+
+# DBDIR specifies the name of a directory in which to install the contents
+# of the `data' directory.
+DBDIR = $(WFDBROOT)/database
+
+# INCDIR specifies the name of a directory in which to install the WFDB
+# library's #include <...> files.
+INCDIR = $(WFDBROOT)/include
+# Note: if you have both gcc and a vendor-supplied C compiler, and if INCDIR
+# is /usr/include, CFLAGS should *not* contain -I$(INCDIR) (if it does, gcc may
+# read the wrong version of files such as stdio.h when compiling WFDB
+# applications).
+
+# LIBDIR specifies the name of a directory in which to install the WFDB
+# library.
+LIBDIR = $(WFDBROOT)/lib
+
+# PSPDIR specifies the name of a directory in which to install the PostScript
+# prolog (*.pro) files from the 'app' directory.
+PSPDIR = $(WFDBROOT)/lib/ps
+
+# CC is the name of your C compiler.  The WFDB library can be compiled with K&R
+# C compilers (`cc' on most if not all UNIX systems) as well as with ANSI C
+# compilers such as GNU C (`gcc').
+CC = gcc
+# On systems where `gcc' is the standard C compiler, `gcc' may also be known as
+# `cc'; in such cases, it doesn't matter if CC is cc or gcc.
+
+# CCDEFS is the set of C compiler options needed to set preprocessor variables
+# while compiling the WFDB Software Package.  CCDEFS should always include
+# VDEFS.  Add the following options to CCDEFS as appropriate (separating them
+# by spaces if you use more than one):
+#   -DISPRINTF	  if you do not have `stdlib.h' and your `sprintf' returns an
+#		   int (see wfdblib.h)
+#   -DNETFILES	  if you have libwww and want to be able to access WFDB files
+#		   remotely via http or ftp (as well as local files)
+#   -DNOMALLOC_H  if you have neither `stdlib.h' nor `malloc.h' (see wfdblib.h)
+#   -DNOSTRTOK	  if your standard C library does not include function `strtok'
+#		   (see wfdbio.c)
+#   -DNOTIME	  if you do not have `time.h' (see signal.c)
+#   -DNOVALUES_H  if you do not have `values.h' (see psd/log10.c)
+#   -DOLDC	  if you have neither `stdarg.h' nor `varargs.h' (see wfdbio.c)
+# If your C compiler fails to compile `signal.c', add -DBROKEN_CC to CCDEFS
+# and try again (see signal.c).
+CCDEFS = $(VDEFS) -DNOVALUES_H
+
+# CFLAGS is the set of C compiler options.  CFLAGS should always include
+# CCDEFS.  Add the following options to CFLAGS as appropriate (separating them
+# by spaces if you use more than one):
+#   -g		  to save symbols for debugging
+#   -O		  if you trust your C compiler's optimizer
+# With the exception of `gcc', most C compilers do not allow you to use -g and
+# -O simultaneously.
+CFLAGS = -g $(CCDEFS) `$(LWC) --cflags` -I$(INCDIR)
+# `gcc' users may comment out the previous line, and uncomment the next one.
+# CFLAGS = -g -O $(CCDEFS) `$(LWC) --cflags` -I$(INCDIR)
+
+# LDFLAGS is appended to the C compiler command line to specify loading the
+# WFDB library.
+LDFLAGS = -L$(LIBDIR) -lwfdb $(LDLIBWWW)
+
+# WFDBLIB is the name of the standard WFDB library.  In order to access it via
+# `-lwfdb', WFDBLIB should be `libwfdb.a'.
+WFDBLIB = libwfdb.a
+
+# If your system requires indexed libraries, uncomment the next line.
+RANLIB = ranlib
+# Otherwise, uncomment the next line.
+# RANLIB = :
+
+# AR is the name of the command used to build a standard library from `.o'
+# files, and ARFLAGS is the set of options used when doing so.  AR and ARFLAGS
+# are usually `make' builtins and need not be defined here;  under HP UX, and
+# perhaps other versions of UNIX, however, you will need to define these
+# variables by uncommenting the next two lines.
+# AR = ar
+# ARFLAGS = rv
+
+# BUILDLIB is the command that creates the static WFDB library once its
+# components have been compiled separately;  the list of *.o files that
+# make up the library will be appended to BUILDLIB.
+BUILDLIB = $(AR) $(ARFLAGS) $(WFDBLIB)
+
+# PRINT is the name of the program used to produce listings (including any
+# options for the desired formatting).
+PRINT = lpr
+
+# SETPERMISSIONS is the command needed to make the installed files accessible
+# to those who will use them.  The value given below makes them readable by
+# everyone, and writeable by the owner only.  (If you perform the installation
+# as `root', `root' is the owner of the installed files.)
+SETPERMISSIONS = chmod 644
+
+# SETDPERMISSIONS is similarly used to make directories created during the
+# installation accessible.
+SETDPERMISSIONS = chmod 755
+
+# SETLPERMISSIONS is the command needed to make the WFDB library usable by
+# programs linked to it.
+SETLPERMISSIONS = chmod 644
+
+# SETXPERMISSIONS is the command needed to make the applications accessible.
+SETXPERMISSIONS = chmod 755
+
+# STRIP is the command used to compact the compiled binaries by removing their
+# symbol tables.  'exestrip' is a script that appends the '.exe' suffix to the
+# files in its argument list before passing their names to 'strip' itself.
+STRIP = ../conf/exestrip
+# To retain the symbol tables for debugging, comment out the previous line, and
+# uncomment the next line.
+# STRIP = :
+
+# `make' (with no target specified) will be equivalent to `make all'.
+make-all:	all
+
+# `make lib-post-install' should be run after installing the WFDB library.
+lib-post-install:
+	echo "Nothing to be done for lib-post-install"
+
+lib-post-uninstall:
+	echo "Nothing to be done for lib-post-uninstall"
+# _____________________________________________________________________________
diff -Naur wfdb-10.1.4/conf/exestrip wfdb-10.1.5/conf/exestrip
--- wfdb-10.1.4/conf/exestrip	Wed Dec 31 19:00:00 1969
+++ wfdb-10.1.5/conf/exestrip	Tue Jun  6 23:03:53 2000
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+for FILE in $*
+do
+   strip $FILE.exe
+done
diff -Naur wfdb-10.1.4/conf/generic.def wfdb-10.1.5/conf/generic.def
--- wfdb-10.1.4/conf/generic.def	Mon Jun  5 06:19:43 2000
+++ wfdb-10.1.5/conf/generic.def	Tue Jun  6 23:56:29 2000
@@ -1,5 +1,5 @@
 # file: generic.def		G. Moody	31 May 2000
-#				Last revised:	5 June 2000
+#				Last revised:	6 June 2000
 # This file contains default 'make' definitions for compiling the WFDB Software
 # Package under versions of UNIX that are not otherwise recognized by
 # 'configure'.
@@ -84,6 +84,7 @@
 #   -DNOSTRTOK	  if your standard C library does not include function `strtok'
 #		   (see wfdbio.c)
 #   -DNOTIME	  if you do not have `time.h' (see signal.c)
+#   -DNOVALUES_H  if you do not have `values.h' (see psd/log10.c)
 #   -DOLDC	  if you have neither `stdarg.h' nor `varargs.h' (see wfdbio.c)
 # If your C compiler fails to compile `signal.c', add -DBROKEN_CC to CCDEFS
 # and try again (see signal.c).
diff -Naur wfdb-10.1.4/conf/version.def wfdb-10.1.5/conf/version.def
--- wfdb-10.1.4/conf/version.def	Thu May 25 20:29:47 2000
+++ wfdb-10.1.5/conf/version.def	Tue Jun  6 22:47:20 2000
@@ -1,10 +1,10 @@
 # file: version.def		G. Moody	24 May 2000
-
+#				Last revised:	6 June 2000
 # Each release of the WFDB Software Package is identified by a three-part
 # version number, defined here:
 MAJOR = 10
 MINOR = 1
-RELEASE = 4
+RELEASE = 5
 VERSION = $(MAJOR).$(MINOR).$(RELEASE)
 
 # VDEFS is the set of C compiler options needed to set version number variables
diff -Naur wfdb-10.1.4/configure wfdb-10.1.5/configure
--- wfdb-10.1.4/configure	Mon Jun  5 23:32:43 2000
+++ wfdb-10.1.5/configure	Tue Jun  6 23:27:47 2000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # file: configure             G. Moody               24 May 2000
-#                             Last revised:          5 June 2000
+#                             Last revised:          6 June 2000
 # Configuration script for the WFDB Software Package
 
 # This script was not generated using 'autoconf'.  If you can implement
@@ -26,6 +26,8 @@
   HP-UX*) OS=HPUX
     cat conf/hpux.def >>conf/site.def
     cat conf/version.def conf/hpux-slib.def >conf/site-slib.def ;;
+  CYGWIN*) OS=cygwin
+    cat conf/cygwin.def >>conf/site.def ;;
   *)      OS=generic
     cat conf/generic.def >>conf/site.def
     cat conf/version.def conf/generic-slib.def >conf/site-slib.def
diff -Naur wfdb-10.1.4/convert/Makefile wfdb-10.1.5/convert/Makefile
--- wfdb-10.1.4/convert/Makefile	Mon Jun  5 23:33:05 2000
+++ wfdb-10.1.5/convert/Makefile	Wed Jun  7 00:12:25 2000
@@ -33,12 +33,12 @@
 # type `make listing'.
 # _____________________________________________________________________________
 # file: version.def		G. Moody	24 May 2000
-
+#				Last revised:	6 June 2000
 # Each release of the WFDB Software Package is identified by a three-part
 # version number, defined here:
 MAJOR = 10
 MINOR = 1
-RELEASE = 4
+RELEASE = 5
 VERSION = $(MAJOR).$(MINOR).$(RELEASE)
 
 # VDEFS is the set of C compiler options needed to set version number variables
diff -Naur wfdb-10.1.4/convert/Makefile.tpl wfdb-10.1.5/convert/Makefile.tpl
--- wfdb-10.1.4/convert/Makefile.tpl	Mon Jun  5 06:47:33 2000
+++ wfdb-10.1.5/convert/Makefile.tpl	Wed Jun  7 18:30:24 2000
@@ -18,12 +18,12 @@
 
 # `make' or `make install':  build and install applications, clean up
 install:	$(BINDIR) all
-	cp $(XFILES) $(BINDIR)
-	cd $(BINDIR); $(SETXPERMISSIONS) $(XFILES)
+	$(SETXPERMISSIONS) $(XFILES)
+	../install.sh $(BINDIR) $(XFILES)
 	$(MAKE) clean
 
 uninstall:
-	../uninstall $(BINDIR) $(XFILES)
+	../uninstall.sh $(BINDIR) $(XFILES)
 
 # `make clean':  remove intermediate and backup files
 clean:
diff -Naur wfdb-10.1.4/data/Makefile wfdb-10.1.5/data/Makefile
--- wfdb-10.1.4/data/Makefile	Mon Jun  5 23:33:05 2000
+++ wfdb-10.1.5/data/Makefile	Wed Jun  7 00:12:25 2000
@@ -33,12 +33,12 @@
 # listing'.
 # _____________________________________________________________________________
 # file: version.def		G. Moody	24 May 2000
-
+#				Last revised:	6 June 2000
 # Each release of the WFDB Software Package is identified by a three-part
 # version number, defined here:
 MAJOR = 10
 MINOR = 1
-RELEASE = 4
+RELEASE = 5
 VERSION = $(MAJOR).$(MINOR).$(RELEASE)
 
 # VDEFS is the set of C compiler options needed to set version number variables
diff -Naur wfdb-10.1.4/data/Makefile.tpl wfdb-10.1.5/data/Makefile.tpl
--- wfdb-10.1.4/data/Makefile.tpl	Mon Jun  5 06:45:58 2000
+++ wfdb-10.1.5/data/Makefile.tpl	Wed Jun  7 16:49:01 2000
@@ -13,7 +13,7 @@
 	-cd $(DBDIR); ln -sf wfdbcal dbcal
 
 uninstall:
-	../uninstall $(DBDIR) $(DBFILES) dbcal
+	../uninstall.sh $(DBDIR) $(DBFILES) dbcal
 
 $(DBDIR):
 	mkdir $(DBDIR); $(SETDPERMISSIONS) $(DBDIR)
diff -Naur wfdb-10.1.4/doc/Makefile wfdb-10.1.5/doc/Makefile
--- wfdb-10.1.4/doc/Makefile	Mon Jun  5 23:33:05 2000
+++ wfdb-10.1.5/doc/Makefile	Wed Jun  7 00:12:25 2000
@@ -101,12 +101,12 @@
 # all freely available (see `../SOURCES').
 # _____________________________________________________________________________
 # file: version.def		G. Moody	24 May 2000
-
+#				Last revised:	6 June 2000
 # Each release of the WFDB Software Package is identified by a three-part
 # version number, defined here:
 MAJOR = 10
 MINOR = 1
-RELEASE = 4
+RELEASE = 5
 VERSION = $(MAJOR).$(MINOR).$(RELEASE)
 
 # VDEFS is the set of C compiler options needed to set version number variables
diff -Naur wfdb-10.1.4/doc/Makefile.tpl wfdb-10.1.5/doc/Makefile.tpl
--- wfdb-10.1.4/doc/Makefile.tpl	Mon Jun  5 15:48:07 2000
+++ wfdb-10.1.5/doc/Makefile.tpl	Wed Jun  7 16:48:52 2000
@@ -117,10 +117,10 @@
 	$(LN) $(MAN1)/view.1 $(MAN1)/vsetup.1
 
 uninstall:
-	../uninstall $(MAN1) *.1 ad2m.1 m2a.1 md2a.1 hrlomb.1 hrmem.1 \
+	../uninstall.sh $(MAN1) *.1 ad2m.1 m2a.1 md2a.1 hrlomb.1 hrmem.1 \
 	 hrplot.1 plot3d.1 cshsetwfdb.1 vsetup.1
-	../uninstall $(MAN3) *.3
-	../uninstall $(MAN5) *.5
+	../uninstall.sh $(MAN3) *.3
+	../uninstall.sh $(MAN5) *.5
 
 # Create directories for installation if necessary.
 $(MAN1):
diff -Naur wfdb-10.1.4/examples/Makefile wfdb-10.1.5/examples/Makefile
--- wfdb-10.1.4/examples/Makefile	Mon Jun  5 23:33:05 2000
+++ wfdb-10.1.5/examples/Makefile	Wed Jun  7 00:12:25 2000
@@ -34,12 +34,12 @@
 # `make clean' to remove them.
 # _____________________________________________________________________________
 # file: version.def		G. Moody	24 May 2000
-
+#				Last revised:	6 June 2000
 # Each release of the WFDB Software Package is identified by a three-part
 # version number, defined here:
 MAJOR = 10
 MINOR = 1
-RELEASE = 4
+RELEASE = 5
 VERSION = $(MAJOR).$(MINOR).$(RELEASE)
 
 # VDEFS is the set of C compiler options needed to set version number variables
diff -Naur wfdb-10.1.4/install.sh wfdb-10.1.5/install.sh
--- wfdb-10.1.4/install.sh	Wed Dec 31 19:00:00 1969
+++ wfdb-10.1.5/install.sh	Wed Jun  7 21:51:21 2000
@@ -0,0 +1,36 @@
+#!/bin/sh
+# file: install.sh		G. Moody	7 June 2000
+
+case $# in
+ 0|1) echo "usage: $0 DIRECTORY FILE [FILE ...]"
+      exit ;;
+esac
+
+DIR=$1
+if [ ! -e $DIR ]
+then
+    mkdir -p $DIR
+fi
+
+if [ ! -d $DIR ]
+then
+    echo "Can't install in $DIR -- exiting."
+    exit
+fi
+
+shift
+
+for FILE in $*
+do
+    if [ -e $FILE.exe ]
+    then
+        cp -p $FILE.exe $DIR
+    else
+        if [ -e $FILE ]
+        then
+	    cp -p $FILE $DIR
+        else
+	    echo "$FILE does not exist"
+        fi
+    fi
+done
diff -Naur wfdb-10.1.4/lib/Makefile wfdb-10.1.5/lib/Makefile
--- wfdb-10.1.4/lib/Makefile	Mon Jun  5 23:33:05 2000
+++ wfdb-10.1.5/lib/Makefile	Wed Jun  7 00:12:25 2000
@@ -33,12 +33,12 @@
 # type `make slib'.
 # _____________________________________________________________________________
 # file: version.def		G. Moody	24 May 2000
-
+#				Last revised:	6 June 2000
 # Each release of the WFDB Software Package is identified by a three-part
 # version number, defined here:
 MAJOR = 10
 MINOR = 1
-RELEASE = 4
+RELEASE = 5
 VERSION = $(MAJOR).$(MINOR).$(RELEASE)
 
 # VDEFS is the set of C compiler options needed to set version number variables
diff -Naur wfdb-10.1.4/lib/Makefile.tpl wfdb-10.1.5/lib/Makefile.tpl
--- wfdb-10.1.4/lib/Makefile.tpl	Mon Jun  5 16:39:32 2000
+++ wfdb-10.1.5/lib/Makefile.tpl	Wed Jun  7 16:48:06 2000
@@ -22,11 +22,11 @@
 	$(MAKE) lib-post-install
 
 uninstall:
-	../uninstall $(INCDIR)/wfdb $(HFILES)
-	../uninstall $(INCDIR)
-	../uninstall $(LIBDIR) $(WFDBLIB)
+	../uninstall.sh $(INCDIR)/wfdb $(HFILES)
+	../uninstall.sh $(INCDIR)
+	../uninstall.sh $(LIBDIR) $(WFDBLIB)
 	$(MAKE) lib-post-uninstall
-	../uninstall $(LIBDIR)
+	../uninstall.sh $(LIBDIR)
 
 # `make compat':  install the includes needed for source compatibility with
 # applications written for pre-version 10.0.0 versions of this library
diff -Naur wfdb-10.1.4/lib/wfdb.h wfdb-10.1.5/lib/wfdb.h
--- wfdb-10.1.4/lib/wfdb.h	Mon Jun  5 23:33:05 2000
+++ wfdb-10.1.5/lib/wfdb.h	Wed Jun  7 00:12:25 2000
@@ -1,5 +1,5 @@
 /* file: wfdb.h		G. Moody	13 June 1983
-			Last revised:   22 May 2000	wfdblib 10.1.4
+			Last revised:   6 June 2000	wfdblib 10.1.5
 WFDB library type, constant, structure, and function interface definitions
 
 _______________________________________________________________________________
@@ -33,12 +33,14 @@
 /* WFDB library version. */
 #define WFDB_MAJOR   10
 #define WFDB_MINOR   1
-#define WFDB_RELEASE 4
+#define WFDB_RELEASE 5
 #define WFDB_NETFILES 1	/* if 1, library includes code for HTTP, FTP clients */
 
 /* Determine what type of compiler is being used. */
 #ifdef __STDC__		/* true for ANSI C compilers only */
 #define wfdb_PROTO	/* function prototypes will be needed */
+#undef _WINDOWS		/* we don't want MS-Windows API in this case */
+#undef _WIN32		/* ... or 32-bit MS-Windows API either */
 #endif
 
 #ifdef __cplusplus	/* true for some C++ compilers */
diff -Naur wfdb-10.1.4/psd/Makefile wfdb-10.1.5/psd/Makefile
--- wfdb-10.1.4/psd/Makefile	Mon Jun  5 23:33:05 2000
+++ wfdb-10.1.5/psd/Makefile	Wed Jun  7 00:12:25 2000
@@ -32,12 +32,12 @@
 # directory).
 # _____________________________________________________________________________
 # file: version.def		G. Moody	24 May 2000
-
+#				Last revised:	6 June 2000
 # Each release of the WFDB Software Package is identified by a three-part
 # version number, defined here:
 MAJOR = 10
 MINOR = 1
-RELEASE = 4
+RELEASE = 5
 VERSION = $(MAJOR).$(MINOR).$(RELEASE)
 
 # VDEFS is the set of C compiler options needed to set version number variables
@@ -159,7 +159,7 @@
 	echo "Nothing to be done for lib-post-uninstall"
 # _____________________________________________________________________________
 # file: Makefile.tpl		G. Moody		24 May 2000
-#				Last revised:		5 June 2000
+#				Last revised:		6 June 2000
 # This section of the Makefile should not need to be changed.
 
 # Programs to be compiled.
@@ -197,7 +197,7 @@
 	$(CC) -o fft -O fft.c -lm
 
 log10:		log10.c
-	$(CC) -o log10 -O log10.c -lm
+	$(CC) $(CCDEFS) -o log10 -O log10.c -lm
 
 lomb:		lomb.c
 	$(CC) -o lomb -O lomb.c -lm
diff -Naur wfdb-10.1.4/psd/Makefile.tpl wfdb-10.1.5/psd/Makefile.tpl
--- wfdb-10.1.4/psd/Makefile.tpl	Mon Jun  5 06:51:25 2000
+++ wfdb-10.1.5/psd/Makefile.tpl	Wed Jun  7 18:29:24 2000
@@ -1,5 +1,5 @@
 # file: Makefile.tpl		G. Moody		24 May 2000
-#				Last revised:		5 June 2000
+#				Last revised:		6 June 2000
 # This section of the Makefile should not need to be changed.
 
 # Programs to be compiled.
@@ -14,8 +14,8 @@
 
 # `make' or `make install':  build and install applications, clean up
 install:	$(BINDIR) all scripts
-	cp $(XFILES) $(BINDIR)
-	cd $(BINDIR); $(SETXPERMISSIONS) $(XFILES)
+	$(SETXPERMISSIONS) $(XFILES)
+	../install.sh $(BINDIR) $(XFILES)
 	$(MAKE) clean
 
 # `make scripts': customize and install scripts
@@ -28,7 +28,7 @@
 	$(SETXPERMISSIONS) $(SCRIPTS)
 
 uninstall:
-	../uninstall $(BINDIR) $(XFILES) $(SCRIPTS)
+	../uninstall.sh $(BINDIR) $(XFILES) $(SCRIPTS)
 
 coherence:	coherence.c
 	$(CC) -o coherence -O coherence.c -lm
@@ -37,7 +37,7 @@
 	$(CC) -o fft -O fft.c -lm
 
 log10:		log10.c
-	$(CC) -o log10 -O log10.c -lm
+	$(CC) $(CCDEFS) -o log10 -O log10.c -lm
 
 lomb:		lomb.c
 	$(CC) -o lomb -O lomb.c -lm
diff -Naur wfdb-10.1.4/psd/log10.c wfdb-10.1.5/psd/log10.c
--- wfdb-10.1.4/psd/log10.c	Sun Jan 30 04:13:20 2000
+++ wfdb-10.1.5/psd/log10.c	Wed Jun  7 00:06:58 2000
@@ -1,9 +1,9 @@
 /* file: log10.c	G. Moody	19 July 1995
-		   Last revised:	 5 May 1999
+		   Last revised:	 7 June 2000
 
 -------------------------------------------------------------------------------
 log10: common log transform of 2-column data
-Copyright (C) 1999 George B. Moody
+Copyright (C) 2000 George B. Moody
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -27,7 +27,7 @@
 
 #include <math.h>
 
-#ifndef NO_LIMIT_H
+#ifndef NOVALUES_H
 #include <values.h>
 #endif
 #ifndef MINDOUBLE
diff -Naur wfdb-10.1.4/uninstall wfdb-10.1.5/uninstall
--- wfdb-10.1.4/uninstall	Mon Jun  5 16:32:42 2000
+++ wfdb-10.1.5/uninstall	Wed Dec 31 19:00:00 1969
@@ -1,25 +0,0 @@
-#!/bin/sh
-# file: uninstall		G. Moody	5 June 2000
-
-case $# in
- 0) echo "usage: $0 DIRECTORY [FILE ...]"
-      exit ;;
-esac
-
-DIR=$1
-if [ -d $DIR ]
-then
-    cd $DIR
-    shift
-    for FILE in $*
-    do
-        rm -f $FILE
-    done
-    cd ..
-
-    # Note that the rmdir command below will fail if DIR is not empty.
-    # This is a *feature*, not a bug -- don't fix it!
-    rmdir $DIR || echo "(Ignored)"
-else
-    echo "uninstall: $DIR does not exist"
-fi
diff -Naur wfdb-10.1.4/uninstall.sh wfdb-10.1.5/uninstall.sh
--- wfdb-10.1.4/uninstall.sh	Wed Dec 31 19:00:00 1969
+++ wfdb-10.1.5/uninstall.sh	Wed Jun  7 16:50:47 2000
@@ -0,0 +1,25 @@
+#!/bin/sh
+# file: uninstall.sh		G. Moody	5 June 2000
+
+case $# in
+ 0) echo "usage: $0 DIRECTORY [FILE ...]"
+      exit ;;
+esac
+
+DIR=$1
+if [ -d $DIR ]
+then
+    cd $DIR
+    shift
+    for FILE in $*
+    do
+        rm -f $FILE
+    done
+    cd ..
+
+    # Note that the rmdir command below will fail if DIR is not empty.
+    # This is a *feature*, not a bug -- don't fix it!
+    rmdir $DIR || echo "(Ignored)"
+else
+    echo "uninstall: $DIR does not exist"
+fi
diff -Naur wfdb-10.1.4/wave/Makefile wfdb-10.1.5/wave/Makefile
--- wfdb-10.1.4/wave/Makefile	Mon Jun  5 23:33:05 2000
+++ wfdb-10.1.5/wave/Makefile	Mon Jun  5 23:31:48 2000
@@ -1,376 +1,19 @@
-# file: Makefile	G. Moody	 1 May 1990
-#			Last revised:   23 May 2000		WAVE 6.3
-# `make' description file for WAVE
-#
-# -----------------------------------------------------------------------------
-# WAVE: Waveform analyzer, viewer, and editor
-# Copyright (C) 2000 George B. Moody
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# You may contact the author by e-mail (george@mit.edu) or postal mail
-# (MIT Room E25-505A, Cambridge, MA 02139 USA).  For updates to this software,
-# please visit PhysioNet (http://www.physionet.org/).
-# _____________________________________________________________________________
-#
-# This file is used with the UNIX `make' command to compile and install WAVE.
-# WAVE can be compiled and run only on UNIX systems, although any networked
-# system with an X11 server can be used to view its output;  suitable servers
-# are available for MS-DOS, the Macintosh, and VAX VMS as well as UNIX.
-# In order to compile WAVE, you must have already installed the X11 Xlib
-# (libX11.a), XView (libxview.a), and WFDB (libwfdb.a) libraries, and their
-# associated header files (in /usr/include/X11, /usr/include/xview, and
-# /usr/include/ecg respectively).  The WFDB library source is included with the
-# WAVE distribution (in the `lib' directory at the same level as this one).
-# Xlib and XView are freely available by anonymous FTP as parts of the X11R4
-# distribution from expo.lcs.mit.edu and other sites, or from the MIT Software
-# Distribution Center, MIT Room E32-300, Cambridge, MA 02139 USA; telephone
-# +1-617-253-6966.  See the main help file (wave.hl0, in this directory) for
-# further information.
-#
-# Before using this file for the first time, check that the site-specific
-# variables below are appropriate for your system.  To build and install WAVE,
-# just type `make' (from within this directory).
-# _____________________________________________________________________________
-# file: version.def		G. Moody	24 May 2000
+# file: nomake		G. Moody	30 January 2000
+#			Last revised:	  5 June 2000
+# If renamed as 'Makefile', this file prevents WAVE from being compiled
+# on systems that don't have XView installed.
 
-# Each release of the WFDB Software Package is identified by a three-part
-# version number, defined here:
-MAJOR = 10
-MINOR = 1
-RELEASE = 4
-VERSION = $(MAJOR).$(MINOR).$(RELEASE)
+all:
+	@echo "Skipping compilation of WAVE (XView required)."
 
-# VDEFS is the set of C compiler options needed to set version number variables
-# while compiling the WFDB Software Package.
-VDEFS = -DWFDB_MAJOR=$(MAJOR) -DWFDB_MINOR=$(MINOR) -DWFDB_RELEASE=$(RELEASE)
-# _____________________________________________________________________________
+wave:
+	@echo "Skipping compilation of WAVE (XView required)."
 
-# file: linux.def		G. Moody	31 May 2000
-#				Last revised:	5 June 2000
-# 'make' definitions for compiling the WFDB Software Package under Linux
-
-# Choose a value for WFDBROOT to determine where the WFDB Software Package will
-# be installed.  One of the following is usually a reasonable choice.
-# Installing in /usr generally requires root permissions, but will be easiest
-# for future software development (no special -I or -L options will be needed
-# to compile software with the WFDB library, since the *.h files and the
-# library will be installed in the standard directories).
-WFDBROOT = /usr
-# Installing in /usr/local usually requires root permissions.  On a multi-user
-# system where it is desirable to keep the OS vendor's software separate from
-# other software, this is a good choice.  Another common choice in such cases
-# is /opt .
-# WFDBROOT = /usr/local
-# To install without root permissions, a good choice is to set WFDBROOT to the
-# name of your home directory, as in the example below (change as needed).
-# WFDBROOT = /home/frodo
-
-# If the W3C's libwww library of HTTP and FTP client code is available, and
-# you wish to compile a WFDB library with NETFILES support, set LWC to
-# 'libwww-config' (a utility supplied with libwww).  Otherwise set LWC to ':'
-# (a program that does nothing, successfully).
-LWC = libwww-config
-
-# LDLIBWWW, which is appended to LDFLAGS below, is the set of options needed
-# to link with libwww.  If libwww is not installed, or if libwfdb is a shared
-# library, LDLIBWWW can be empty (if there is a '#' immediately after the '='
-# below, the remainder of the line is ignored, so LDLIBWWW is empty in this
-# case).  Otherwise, it is generated from the output of LWC.  Note that up to
-# three passes through the option list are necessary to satisfy all
-# dependencies when linking to the static libwww libraries.
-LDLIBWWW = # `$(LWC) --libs` `$(LWC) --libs` `$(LWC) --libs`
-
-# BINDIR specifies the directory in which the applications will be installed;
-# it should be a directory in the PATH of those who will use the applications.
-BINDIR = $(WFDBROOT)/bin
-
-# DBDIR specifies the name of a directory in which to install the contents
-# of the `data' directory.
-DBDIR = $(WFDBROOT)/database
-
-# INCDIR specifies the name of a directory in which to install the WFDB
-# library's #include <...> files.
-INCDIR = $(WFDBROOT)/include
-
-# LIBDIR specifies the name of a directory in which to install the WFDB
-# library.
-LIBDIR = $(WFDBROOT)/lib
-
-# PSPDIR specifies the name of a directory in which to install the PostScript
-# prolog (*.pro) files from the 'app' directory.
-PSPDIR = $(WFDBROOT)/lib/ps
-
-# CC is the name of your C compiler.
-CC = gcc
-
-# CFLAGS is the set of C compiler options.  CFLAGS should always include
-# VDEFS.
-CFLAGS = -g -O $(VDEFS) `$(LWC) --cflags` -I$(INCDIR)
-
-# LDFLAGS is appended to the C compiler command line to specify loading the
-# WFDB library.
-LDFLAGS = -L$(LIBDIR) -lwfdb $(LDLIBWWW)
-
-# WFDBLIB is the name of the standard WFDB library.  In order to access it via
-# `-lwfdb', WFDBLIB should be `libwfdb.a'.
-WFDBLIB = libwfdb.a
-
-# BUILDLIB is the command that creates the static WFDB library once its
-# components have been compiled separately;  the list of *.o files that
-# make up the library will be appended to BUILDLIB.
-BUILDLIB = $(AR) $(ARFLAGS) $(WFDBLIB)
-
-# PRINT is the name of the program used to produce listings (including any
-# options for the desired formatting).
-PRINT = lpr
-
-# SETPERMISSIONS is the command needed to make the installed files accessible
-# to those who will use them.  The value given below makes them readable by
-# everyone, and writeable by the owner only.  (If you perform the installation
-# as `root', `root' is the owner of the installed files.)
-SETPERMISSIONS = chmod 644
-
-# SETDPERMISSIONS is similarly used to make directories created during the
-# installation accessible.
-SETDPERMISSIONS = chmod 755
-
-# SETLPERMISSIONS is the command needed to make the WFDB library usable by
-# programs linked to it.
-SETLPERMISSIONS = chmod 644
-
-# SETXPERMISSIONS is the command needed to make the applications accessible.
-SETXPERMISSIONS = chmod 755
-
-# STRIP is the command used to compact the compiled binaries by removing their
-# symbol tables.
-STRIP = strip
-# To retain the symbol tables for debugging, comment out the previous line, and
-# uncomment the next line.
-# STRIP = :
-
-# `make' (with no target specified) will be equivalent to `make all'.
-make-all:	all
-
-# `make lib-post-install' should be run after installing the WFDB library.
-lib-post-install:
-	ranlib $(LIBDIR)/$(WFDBLIB)
-
-lib-post-uninstall:
-	echo "Nothing to be done for lib-post-uninstall"
-# _____________________________________________________________________________
-# file: Makefile.tpl		G. Moody		31 May 2000
-#				Last revised:		5 June 2000
-# Change the settings below as appropriate for your setup.
-
-# WAVEVERSION is the WAVE version number.
-WAVEVERSION = 6.3
-
-# Choose directories in which to install WAVE and its ancillary files by
-# editing the variables below.  You will need write permission in all of them
-# in order to install WAVE successfully, and WAVE users will need read
-# permission in all of them.  If the directories don't exist already, they
-# will be created with appropriate permissions by the installation procedure.
-
-# This section of site-dependent variables specifies the locations in your
-# file system where the WAVE software and data files will be installed.
-# You may choose a different set of locations if you prefer, but documentation
-# included in this package generally assumes that you have used the defaults
-# given here.  You will need write permission in all of the directories named
-# in this section, and users of the software will need read permission in all
-# of these directories.  Generally, you will need `root' permissions in order
-# to install the software in the standard places.
-
-# HELPDIR specifies the directory in which the on-line help files are kept.
-# The installation procedure creates a subdirectory, `wave', in HELPDIR, and
-# installs several files there.
-HELPDIR = $(WFDBROOT)/help
-
-# MENUDIR specifies the directory in which the default analysis menu file is
-# kept.
-MENUDIR = $(WFDBROOT)/lib
-
-# RESDIR specifies the directory in which X11 client resource files are kept.
-RESDIR = $(WFDBROOT)/lib/X11/app-defaults
-
-# OPENWINHOME specifies the root directory of the OpenWindows hierarchy.
-# This is usually /usr/openwin.
-OPENWINHOME = /usr/openwin
-
-# OWINCDIR is the directory in which the `xview' directory containing XView
-# *.h files is found.
-OWINCDIR = $(OPENWINHOME)/include
-
-# OWLIBDIR is the directory in which the XView library is found.
-OWLIBDIR = $(OPENWINHOME)/lib
-
-# WCFLAGS is the set of C compiler options.
-WCFLAGS = $(CFLAGS) -I$(OWINCDIR)
-
-# HELPOBJ can be set to "help.o" if you wish to recompile the XView spot help
-# functions in "help.c" (recommended under Linux).
-HELPOBJ = help.o
-# Otherwise, use the version in libxview by uncommenting the next line:
-# HELPOBJ =
-
-# WLDFLAGS is the set of loader options appended to the C compiler command line
-# to specify loading the WFDB, XView, and Xlib libraries.
-WLDFLAGS = $(LDFLAGS) -L$(OWLIBDIR) -L/usr/X11R6/lib -lxview -lolgx -lX11
-# Users of Red Hat Linux 5.0 or 5.1 (not later versions), use this instead:
-# WLDFLAGS = $(LDFLAGS) -L$(OWLIBDIR) -L/usr/X11R6/lib \
-#  /usr/openwin/lib/libxview.a /usr/openwin/lib/libolgx.a -lX11
-# This setting avoids incompatibilities with the shared (dynamic) libraries.
-# If you use another version of Linux, or another OS, and have difficulty
-# related to WAVE's Analysis commands window, try this workaround, and let
-# me know if it works (or if it doesn't work).
-
-# It should not be necessary to modify anything below this line.
-# -----------------------------------------------------------------------------
-
-HFILES = wave.h bitmaps.h xvwave.h
-CFILES = wave.c init.c mainpan.c modepan.c helppan.c logpan.c annpan.c edit.c \
- grid.c sig.c annot.c analyze.c scope.c search.c xvwave.c help.c
-OFILES = wave.o init.o mainpan.o modepan.o helppan.o logpan.o annpan.o edit.o \
- grid.o sig.o annot.o analyze.o scope.o search.o xvwave.o $(HELPOBJ)
-HELPFILES = analysis.hlp buttons.hlp editing.hlp faq.hlp intro.hlp log.hlp \
- printing.hlp resource.hlp
-OTHERFILES = wave.hl0 wave.info wave.pro demo.txt Wave.res wavemenu.def \
- Makefile
-
-all:	wave
-
-# `make install':  compile and install WAVE and its help files
-install:	$(BINDIR) $(HELPDIR)/wave $(MENUDIR) $(RESDIR) wave wave.hlp
-	sed s/WAVEVERSION/$(WAVEVERSION)/ <wave.prf | sed "s/WHEN/`date`/" | \
-	 sed "s%HELPDIR%$(HELPDIR)%" >wave.pro
-	$(STRIP) wave; cp wave $(BINDIR); $(SETXPERMISSIONS) $(BINDIR)/wave
-	cp $(HELPFILES) wave.hlp wave.info wave.pro demo.txt $(HELPDIR)/wave
-	-ln -s $(HELPDIR)/wave/wave.pro $(HELPDIR)/wave/news.hlp
-	cd $(HELPDIR)/wave; $(SETPERMISSIONS) $(HELPFILES) news.hlp wave.info \
-	 wave.pro demo.txt
-	-cp wavemenu.def $(MENUDIR) && \
-	 $(SETPERMISSIONS) $(MENUDIR)/wavemenu.def
-	-cp Wave.res $(RESDIR)/Wave && $(SETPERMISSIONS) $(RESDIR)/Wave
+install:
+	@echo "Skipping installation of WAVE (XView required)."
 
 uninstall:
-	../uninstall $(BINDIR) wave
-	../uninstall $(HELPDIR)/wave $(HELPFILES) wave.hlp wave.info wave.pro \
-	  demo.txt news.hlp
-	rmdir $(HELPDIR) || echo "(Ignored)"
-	../uninstall $(MENUDIR) wavemenu.def
-	../uninstall $(RESDIR) Wave
-	../uninstall $(LIBDIR)/X11
-	../uninstall $(LIBDIR)
+	@echo "Nothing to uninstall from wave"
 
-wave:		$(OFILES)
-	$(CC) -o wave $(OFILES) $(WLDFLAGS)
-
-# `make help':  show help text
-help:
-	@echo "*************************************************************"
-	@echo "To print the WAVE manual, type 'make manual'."
-	@echo "If you have a PostScript Printer, you may also wish to print"
-	@echo "the WAVE User's Guide, by typing 'make guide'."
-	@echo "*************************************************************"
-	@echo
-	@echo -n "Press <Return> to view the manual on-screen: "
-	@read x
-	@echo
-	@soelim wave.hl0 | more
-	@echo
-	@echo "*************************************************************"
-	@echo "To print the WAVE manual, type 'make manual'."
-	@echo "If you have a PostScript Printer, you may also wish to print"
-	@echo "the WAVE User's Guide, by typing 'make guide'."
-	@echo "*************************************************************"
-
-wave-static:	$(OFILES)
-	$(CC) -o wave-static $(OFILES) -static $(LDFLAGS)
-
-soelim:		soelim.c
-	$(CC) -o soelim -O soelim.c
-
-wave.hlp:	soelim wave.hl0 $(HELPFILES)
-	./soelim wave.hl0 >wave.hlp
-
-wave.pro:
-	sed s/WAVEVERSION/$(WAVEVERSION)/ <wave.prf | sed "s/WHEN/`date`/" | \
-	 sed "s%WAVEPRO%$(HELPDIR)/wave/wave.pro%" >wave.pro
-
-# `make manual': print the on-line manual
-manual:
-	./soelim wave.hl0 | $(PRINT)
-
-# `make guide': print the WAVE User's Guide
-guide:
-	cd ../../manuals/wavguide; make guide
-
-# `make TAGS':  make an `emacs' TAGS file
-TAGS:		$(HFILES) $(CFILES)
-	@etags $(HFILES) $(CFILES)
-
-# `make clean':  remove intermediate and backup files
 clean:
 	rm -f soelim wave wave-static *.o *~ wave.hlp wave.pro
-
-# `make listing':  print a listing of WAVE sources
-listing:	wave.hlp wave.pro
-	$(PRINT) README REGCARD $(HFILES) $(CFILES) $(HELPFILES) $(OTHERFILES)
-
-# Dependencies and special rules for compilation of the modules of `wave'
-wave.o:		wave.h wave.c
-	$(CC) -c $(WCFLAGS) -DHELPDIR=\"$(HELPDIR)\" wave.c
-init.o:		wave.h xvwave.h init.c
-	$(CC) -c $(WCFLAGS) init.c
-mainpan.o:	wave.h xvwave.h mainpan.c Makefile
-	$(CC) -c $(WCFLAGS) -DWAVEVERSION=\"$(WAVEVERSION)\" mainpan.c
-modepan.o:	wave.h xvwave.h modepan.c
-	$(CC) -c $(WCFLAGS) modepan.c
-helppan.o:	wave.h xvwave.h helppan.c
-	$(CC) -c $(WCFLAGS) -DWAVEVERSION=\"$(WAVEVERSION)\" helppan.c
-logpan.o:	wave.h xvwave.h logpan.c
-	$(CC) -c $(WCFLAGS) logpan.c
-annpan.o:	wave.h xvwave.h annpan.c
-	$(CC) -c $(WCFLAGS) annpan.c
-edit.o:		wave.h xvwave.h edit.c
-	$(CC) -c $(WCFLAGS) edit.c
-grid.o:		wave.h xvwave.h grid.c
-	$(CC) -c $(WCFLAGS) grid.c
-search.o:	wave.h xvwave.h search.c
-	$(CC) -c $(WCFLAGS) search.c
-sig.o:		wave.h xvwave.h sig.c
-	$(CC) -c $(WCFLAGS) sig.c
-annot.o:	wave.h xvwave.h annot.c
-	$(CC) -c $(WCFLAGS) -DWAVEVERSION=\"$(WAVEVERSION)\" annot.c
-analyze.o:	wave.h xvwave.h analyze.c
-	$(CC) -c $(WCFLAGS) -DMENUDIR=\"$(MENUDIR)\" analyze.c
-scope.o:	wave.h xvwave.h scope.c
-	$(CC) -c $(WCFLAGS) scope.c
-xvwave.o:	wave.h xvwave.h bitmaps.h xvwave.c
-	$(CC) -c $(WCFLAGS) -DRESDIR=\"$(RESDIR)\" xvwave.c
-help.o:		help.c
-	$(CC) -c $(WCFLAGS) -w help.c
-
-# Create directories for installation if necessary.
-$(BINDIR):
-	mkdir -p $(BINDIR); $(SETDPERMISSIONS) $(BINDIR)
-$(HELPDIR):
-	mkdir -p $(HELPDIR); $(SETDPERMISSIONS) $(HELPDIR)
-$(HELPDIR)/wave:
-	mkdir -p $(HELPDIR)/wave; $(SETDPERMISSIONS) $(HELPDIR)/wave
-$(MENUDIR):
-	mkdir -p $(MENUDIR); $(SETDPERMISSIONS) $(MENUDIR)
-$(RESDIR):
-	mkdir -p $(RESDIR); $(SETDPERMISSIONS) $(RESDIR)
diff -Naur wfdb-10.1.4/wave/Makefile.tpl wfdb-10.1.5/wave/Makefile.tpl
--- wfdb-10.1.4/wave/Makefile.tpl	Mon Jun  5 17:46:03 2000
+++ wfdb-10.1.5/wave/Makefile.tpl	Wed Jun  7 18:28:03 2000
@@ -82,7 +82,7 @@
 install:	$(BINDIR) $(HELPDIR)/wave $(MENUDIR) $(RESDIR) wave wave.hlp
 	sed s/WAVEVERSION/$(WAVEVERSION)/ <wave.prf | sed "s/WHEN/`date`/" | \
 	 sed "s%HELPDIR%$(HELPDIR)%" >wave.pro
-	$(STRIP) wave; cp wave $(BINDIR); $(SETXPERMISSIONS) $(BINDIR)/wave
+	$(STRIP) wave; $(SETXPERMISSIONS) wave;	../install.sh $(BINDIR) wave
 	cp $(HELPFILES) wave.hlp wave.info wave.pro demo.txt $(HELPDIR)/wave
 	-ln -s $(HELPDIR)/wave/wave.pro $(HELPDIR)/wave/news.hlp
 	cd $(HELPDIR)/wave; $(SETPERMISSIONS) $(HELPFILES) news.hlp wave.info \
@@ -92,14 +92,14 @@
 	-cp Wave.res $(RESDIR)/Wave && $(SETPERMISSIONS) $(RESDIR)/Wave
 
 uninstall:
-	../uninstall $(BINDIR) wave
-	../uninstall $(HELPDIR)/wave $(HELPFILES) wave.hlp wave.info wave.pro \
+	../uninstall.sh $(BINDIR) wave
+	../uninstall.sh $(HELPDIR)/wave $(HELPFILES) wave.hlp wave.info wave.pro \
 	  demo.txt news.hlp
 	rmdir $(HELPDIR) || echo "(Ignored)"
-	../uninstall $(MENUDIR) wavemenu.def
-	../uninstall $(RESDIR) Wave
-	../uninstall $(LIBDIR)/X11
-	../uninstall $(LIBDIR)
+	../uninstall.sh $(MENUDIR) wavemenu.def
+	../uninstall.sh $(RESDIR) Wave
+	../uninstall.sh $(LIBDIR)/X11
+	../uninstall.sh $(LIBDIR)
 
 wave:		$(OFILES)
 	$(CC) -o wave $(OFILES) $(WLDFLAGS)
diff -Naur wfdb-10.1.4/waverc/Makefile wfdb-10.1.5/waverc/Makefile
--- wfdb-10.1.4/waverc/Makefile	Mon Jun  5 23:33:05 2000
+++ wfdb-10.1.5/waverc/Makefile	Wed Jun  7 00:12:25 2000
@@ -25,12 +25,12 @@
 # please visit PhysioNet (http://www.physionet.org/).
 # _____________________________________________________________________________
 # file: version.def		G. Moody	24 May 2000
-
+#				Last revised:	6 June 2000
 # Each release of the WFDB Software Package is identified by a three-part
 # version number, defined here:
 MAJOR = 10
 MINOR = 1
-RELEASE = 4
+RELEASE = 5
 VERSION = $(MAJOR).$(MINOR).$(RELEASE)
 
 # VDEFS is the set of C compiler options needed to set version number variables
@@ -152,7 +152,7 @@
 	echo "Nothing to be done for lib-post-uninstall"
 # _____________________________________________________________________________
 # file: Makefile.tpl		G. Moody		24 May 2000
-#				Last revised:		5 June 2000
+#				Last revised:		7 June 2000
 # Change the settings below as appropriate for your setup.
 
 # URLV is the command that starts your web browser if necessary and opens the
@@ -169,8 +169,8 @@
 # Guide for instructions on setting up `wavescript' as a helper application for
 # your Web browser.
 install:	$(BINDIR) urlview wavescript wave-remote
-	strip wavescript
-	strip wave-remote
+	$(STRIP) wavescript
+	$(STRIP) wave-remote
 	cp urlview wavescript wave-remote $(BINDIR)
 	$(SETXPERMISSIONS) $(BINDIR)/urlview $(BINDIR)/wavescript \
 	 $(BINDIR)/wave-remote
diff -Naur wfdb-10.1.4/waverc/Makefile.tpl wfdb-10.1.5/waverc/Makefile.tpl
--- wfdb-10.1.4/waverc/Makefile.tpl	Mon Jun  5 06:48:41 2000
+++ wfdb-10.1.5/waverc/Makefile.tpl	Wed Jun  7 18:28:45 2000
@@ -1,5 +1,5 @@
 # file: Makefile.tpl		G. Moody		24 May 2000
-#				Last revised:		5 June 2000
+#				Last revised:		7 June 2000
 # Change the settings below as appropriate for your setup.
 
 # URLV is the command that starts your web browser if necessary and opens the
@@ -16,14 +16,13 @@
 # Guide for instructions on setting up `wavescript' as a helper application for
 # your Web browser.
 install:	$(BINDIR) urlview wavescript wave-remote
-	strip wavescript
-	strip wave-remote
-	cp urlview wavescript wave-remote $(BINDIR)
-	$(SETXPERMISSIONS) $(BINDIR)/urlview $(BINDIR)/wavescript \
-	 $(BINDIR)/wave-remote
+	$(STRIP) wavescript
+	$(STRIP) wave-remote
+	$(SETXPERMISSIONS) urlview wavescript wave-remote
+	../install.sh $(BINDIR) urlview wavescript wave-remote
 
 uninstall:
-	../uninstall $(BINDIR) urlview wavescript wave-remote
+	../uninstall.sh $(BINDIR) urlview wavescript wave-remote
 
 # `urlview' opens a web browser to view a named URL.
 urlview:	Makefile
diff -Naur wfdb-10.1.4/wview/wview.c wfdb-10.1.5/wview/wview.c
--- wfdb-10.1.4/wview/wview.c	Sun Jan 30 04:13:27 2000
+++ wfdb-10.1.5/wview/wview.c	Sun Jun 11 00:11:29 2000
@@ -1,9 +1,9 @@
 /* file: wview.c        G. Moody        20 January 1993
-                        Last revised:      7 May 1999
+                        Last revised:     11 June 2000
    
 -------------------------------------------------------------------------------
 wview: view WFDB-format signals and annotations under MS Windows
-Copyright (C) 1999 George B. Moody
+Copyright (C) 2000 George B. Moody
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -1208,7 +1208,7 @@
     wfdbquit();
     
     /* Open the signal file(s) for the record to be browsed. */
-    nsig = isigopen(record, si, DB_MAXSIG);
+    nsig = isigopen(record, si, WFDB_MAXSIG);
     
     /* Recalculate the current time (necessary if the sampling frequencies
        of the new record and the old record differ). */
@@ -1237,7 +1237,7 @@
 {
     static WFDB_Anninfo ai;
     
-    ai.name = annotator; ai.stat = READ;
+    ai.name = annotator; ai.stat = WFDB_READ;
     return (nann = annopen(record, &ai, 1) + 1);
 }