clean up

1 files changed, 12 insertions, 21 deletions

diff --git a/xc/Makefile.ini b/xc/Makefile.ini
index 8c16d7488..49ff5adf3 100644
--- a/xc/Makefile.ini
+++ b/xc/Makefile.ini
@@ -1,4 +1,4 @@
-# $XConsortium: Makefile.ini,v 1.16 93/09/04 15:54:19 rws Exp $
+# $XConsortium: Makefile.ini,v 1.17 93/09/11 18:58:29 rws Exp $
 
 SHELL = /bin/sh
 RM = rm -f
@@ -17,21 +17,20 @@ IMAKE_CMD = $(IMAKE) -I$(IRULESRC) $(IMAKE_DEFINES)
 FLAGS = $(MFLAGS) -f Makefile.ini BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)"
 
 all:
-	@echo "Please use make World, and set BOOTSTRAPCFLAGS if necessary."
-	@echo "Do not name your log file make.log or it will be deleted."
-	@echo "Check the configuration parameters in the config directory,
-	@echo "and read the release notes carefully before proceeding."
-	@echo "If the top-level Makefile gets corrupted, copy Makefile.ini
-	@echo "to Makefile and try again."
+	@echo Please use make World, or on NT use make World.Win32.
+	@echo Check the configuration parameters in the config/cf directory,
+	@echo and pass BOOTSTRAPCFLAGS if necessary.
+	@echo Read the release notes carefully before proceeding.
+	@echo Do not name your log file make.log or it will be deleted.
+	@echo If the top-level Makefile gets corrupted, copy Makefile.ini
+	@echo to Makefile and try again.
 
 World:
 	@echo ""
-	@echo "Building Release 6alpha of the X Window System"
+	@echo Building Release 6alpha of the X Window System
 	@echo ""
-	@echo "##############################################################"
-	@echo "# Did you remember to check the configuration parameters in  #"
-	@echo "# the directory ./config and set BOOTSTRAPCFLAGS if needed?  #"
-	@echo "##############################################################"
+	@echo Did you remember to check the configuration parameters in
+	@echo the directory config/cf and pass BOOTSTRAPCFLAGS if needed?
 	@echo ""
 	@date
 	@echo ""
@@ -46,7 +45,7 @@ World:
 	@echo ""
 	@date
 	@echo ""
-	@echo "Full build of Release 6alpha of the X Window System complete."
+	@echo Full build of Release 6alpha of the X Window System complete.
 	@echo ""
 
 Makefile:
@@ -54,14 +53,6 @@ Makefile:
 	-$(RM) Makefile.bak; $(MV) Makefile Makefile.bak
 	$(IMAKE_CMD) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR)
 
-all.Win32:
-	@echo Please use make World.Win32
-	@echo Do not name your log file make.log or it will be deleted.
-	@echo Check the configuration parameters in the config directory.
-	@echo and read the release notes carefully before proceeding.
-	@echo If the top-level Makefile gets corrupted, copy Makefile.ini
-	@echo to Makefile and try again.
-
 World.Win32:
 	@echo :
 	@echo Building Release 6alpha of the X Window System