Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/xsrc/Makefile,v
rcsdiff: /ftp/cvs/cvsroot/xsrc/Makefile,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- xsrc/Makefile	1999/09/06 12:52:11	1.6
+++ xsrc/Makefile	1999/09/14 08:21:45	1.7
@@ -1,13 +1,14 @@
-#	$NetBSD: Makefile,v 1.6 1999/09/06 12:52:11 tron Exp $
+#	$NetBSD: Makefile,v 1.7 1999/09/14 08:21:45 fredb Exp $
 #
 # build and install xsrc
 
 all: all-xc all-contrib
 
 all-xc:
-.if exists(xc/xmakefile)
-	@cd xc && ${MAKE} -f xmakefile World
+.if exists(xc/xmakefile) && defined(UPDATE)
+	@cd xc && ${MAKE} Everything
 .else
+	@-rm -f xc/xmakefile
 	@cd xc && ${MAKE} World
 .endif
 
@@ -27,10 +28,10 @@ install-contrib:
 	@cd contrib && ${MAKE} install && ${MAKE} install.man
 
 clean:
-	@cd xc && ${MAKE} clean
+	@-cd xc && ${MAKE} clean
 	@-cd contrib && ${MAKE} clean
 
-cleandir distclean:
+cleandir distclean: clean
 	find xc contrib -name .depend | xargs rm
 	find xc contrib -name 'Makefile*' | \
 	xargs grep -l "Makefile generated by imake" | xargs rm
@@ -38,10 +39,8 @@ cleandir distclean:
 	rm -f xc/xmakefile
 
 build:
-.if exists(xc/xmakefile)
-	@echo ""
-	@echo "Warning:  This does not rebuild from a clean tree."
-	@echo "Use 'make clean' first if you want to start from scratch."
-	@echo ""
-.endif
+.if defined(UPDATE)
 	@${MAKE} all install
+.else
+	@${MAKE} cleandir all install
+.endif