summaryrefslogtreecommitdiff
path: root/x11/openmotif/patches/patch-config-cf-Motif.rules
blob: 4a95e9072ff1811b59736a8daff18bfc3e4cf5bd (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
$NetBSD: patch-config-cf-Motif.rules,v 1.1.1.1 2000/10/29 16:17:13 mjl Exp $

--- config/cf/Motif.rules.orig	Sun Oct 29 15:34:02 2000
+++ config/cf/Motif.rules	Sun Oct 29 15:34:14 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
@@ -698,7 +699,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)				@@\