--- config/cf/Motif.rules.orig	Tue May  2 11:53:43 2000
+++ config/cf/Motif.rules	Wed Aug  9 19:29:43 2000
@@ -50,9 +50,10 @@
 # define MotifIsTopLevelProject	NO
 #endif
 
-/* Include the X11 project rules file. */
+#ifndef X11IsTopLevelProject
+/* If we have not included X11.rules yet, do it now. */
 #include <X11.rules>
-
+#endif
 
 /* Use the in-tree Motif by default. */
 #ifndef UseInstalledMotif
@@ -655,7 +656,7 @@
 #define Real_MessageCatalogRule(prefix)					@@\
 prefix.cat Concat(prefix,MsgCatI.h):					@@\
 	$(RM) Concat(prefix,MsgCatI.h) prefix.cat $(MLOCSRC)/C/msg/prefix.msg	@@\
-	$(MKCATTOOL) Concat(prefix,MsgCatI.h) prefix.msg > $(MLOCSRC)/C/msg/prefix.msg	@@\
+	$(MKCATTOOL) Concat(prefix,MsgCatI.h) prefix.msg | sed '/^[ 	]*$$/d' > $(MLOCSRC)/C/msg/prefix.msg	@@\
 	$(GENCAT) prefix.cat $(MLOCSRC)/C/msg/prefix.msg		@@\
 									@@\
 includes:: prefix.cat Concat(prefix,MsgCatI.h)				@@\