tls
Fri Dec 27 20:41:49 PST 1996
Update of /a/cvsroot/src/usr.bin/make
In directory netbsd1:/var/slash-tmp/make

Log Message:
Import 4.4BSD-Lite2 sources onto CSRG branch (already merged at head)

Status:

Vendor Tag:	CSRG
Release Tags:	lite-2
		
C src/usr.bin/make/Makefile
C src/usr.bin/make/make.1
U src/usr.bin/make/Makefile.dist
C src/usr.bin/make/bit.h
C src/usr.bin/make/buf.c
C src/usr.bin/make/buf.h
C src/usr.bin/make/compat.c
C src/usr.bin/make/cond.c
C src/usr.bin/make/config.h
C src/usr.bin/make/dir.c
C src/usr.bin/make/dir.h
C src/usr.bin/make/for.c
C src/usr.bin/make/hash.c
C src/usr.bin/make/hash.h
C src/usr.bin/make/job.c
C src/usr.bin/make/job.h
C src/usr.bin/make/list.h
C src/usr.bin/make/lst.h
C src/usr.bin/make/main.c
C src/usr.bin/make/make.c
C src/usr.bin/make/make.h
C src/usr.bin/make/nonints.h
C src/usr.bin/make/parse.c
C src/usr.bin/make/pathnames.h
C src/usr.bin/make/sprite.h
I src/usr.bin/make/tags
C src/usr.bin/make/str.c
C src/usr.bin/make/suff.c
C src/usr.bin/make/targ.c
I src/usr.bin/make/obj
C src/usr.bin/make/var.c
C src/usr.bin/make/arch.c
U src/usr.bin/make/PSD.doc/Makefile
C src/usr.bin/make/PSD.doc/tutorial.ms
C src/usr.bin/make/lst.lib/lstSucc.c
C src/usr.bin/make/lst.lib/lstAtEnd.c
C src/usr.bin/make/lst.lib/lstAtFront.c
C src/usr.bin/make/lst.lib/lstClose.c
C src/usr.bin/make/lst.lib/lstConcat.c
C src/usr.bin/make/lst.lib/lstDatum.c
C src/usr.bin/make/lst.lib/lstDeQueue.c
C src/usr.bin/make/lst.lib/lstDestroy.c
C src/usr.bin/make/lst.lib/lstDupl.c
C src/usr.bin/make/lst.lib/lstFind.c
C src/usr.bin/make/lst.lib/lstInt.h
C src/usr.bin/make/lst.lib/lstEnQueue.c
C src/usr.bin/make/lst.lib/lstFindFrom.c
C src/usr.bin/make/lst.lib/lstFirst.c
C src/usr.bin/make/lst.lib/lstForEach.c
C src/usr.bin/make/lst.lib/lstForEachFrom.c
C src/usr.bin/make/lst.lib/lstInit.c
C src/usr.bin/make/lst.lib/lstInsert.c
C src/usr.bin/make/lst.lib/lstIsAtEnd.c
C src/usr.bin/make/lst.lib/lstIsEmpty.c
C src/usr.bin/make/lst.lib/lstLast.c
C src/usr.bin/make/lst.lib/lstMember.c
C src/usr.bin/make/lst.lib/lstNext.c
C src/usr.bin/make/lst.lib/lstOpen.c
C src/usr.bin/make/lst.lib/lstRemove.c
C src/usr.bin/make/lst.lib/lstReplace.c
C src/usr.bin/make/lst.lib/lstAppend.c

57 conflicts created by this import.
Use the following command to help the merge:

	cvs checkout -jCSRG:yesterday -jCSRG src/usr.bin/make