Latest version from Cyclic

2 files changed, 11 insertions, 2 deletions

diff --git a/gnu/usr.bin/cvs/os2/ChangeLog b/gnu/usr.bin/cvs/os2/ChangeLog
index 4744ad40987..e4371461129 100644
--- a/gnu/usr.bin/cvs/os2/ChangeLog
+++ b/gnu/usr.bin/cvs/os2/ChangeLog
@@ -1,3 +1,12 @@
+1998-12-29  Jim Kingdon  <http://www.cyclic.com>
+
+	* Makefile.in: Use the getdate.c in ../lib rather than the one
+	here.  I don't know whether it compiles with Watcom and/or IBM's
+	compiler, but having a copy of getdate.c in this directory has
+	proven to be unworkable (the version I am removing still had Y2K
+	bugs which were fixed in lib/getdate.c, for example).
+	* getdate.c: Removed.
+
 1998-04-09  Jim Kingdon  <kingdon@harvey.cyclic.com>
 
 	* filesubr.c (link_file): Remove; no longer used.
diff --git a/gnu/usr.bin/cvs/os2/Makefile.in b/gnu/usr.bin/cvs/os2/Makefile.in
index 715959eaa7d..5febf7eb335 100644
--- a/gnu/usr.bin/cvs/os2/Makefile.in
+++ b/gnu/usr.bin/cvs/os2/Makefile.in
@@ -84,7 +84,6 @@ OS2_SOURCES = \
        ${srcdir}${SL}waitpid.c \
        ${srcdir}${SL}popen.c \
        ${srcdir}${SL}porttcp.c \
-       ${srcdir}${SL}getdate.c \
        ${srcdir}${SL}getpass.c
 
 # sources we use from the common src dir, ..${SL}src
@@ -145,6 +144,7 @@ COMMON_SOURCES = \
 # sources from ..${SL}lib
 # FIXME: Is this used anywhere?  I don't think it is.
 LIB_SOURCES = \
+       ${lib_dir}${SL}getdate.c \
        ${lib_dir}${SL}getopt.c \
        ${lib_dir}${SL}getopt1.c \
        ${lib_dir}${SL}getline.c \
@@ -170,7 +170,6 @@ OS2_OBJECTS = \
        ${srcdir}${SL}waitpid.obj \
        ${srcdir}${SL}popen.obj \
        ${srcdir}${SL}porttcp.obj \
-       ${srcdir}${SL}getdate.obj \
        ${srcdir}${SL}getpass.obj
 
 # object files from ..${SL}src
@@ -230,6 +229,7 @@ COMMON_OBJECTS = \
 
 # objects from ..${SL}lib
 LIB_OBJECTS = \
+       ${lib_dir}${SL}getdate.obj \
        ${lib_dir}${SL}getopt.obj \
        ${lib_dir}${SL}getopt1.obj \
        ${lib_dir}${SL}getline.obj \