From 8cf11c7ef01761c56e0eac12fc4da12a4bb6abed Mon Sep 17 00:00:00 2001
From: "Sergey V. Udaltsov" <svu@gnome.org>
Date: Mon, 12 Jan 2009 22:48:37 +0000
Subject: [PATCH] fix the build

---
 ChangeLog         |  5 +++++
 rules/Makefile.am | 17 ++++++++++-------
 rules/merge.sh    |  5 ++++-
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 40cb95b..f1752e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-12  Sergey Udaltsov
+
+	* rules/Makefile.am, rules/merge.sh: fix the build (thanks to Oswald
+	Buddenhagen)
+
 2009-01-11  Sergey Udaltsov
 
 	* rules/base.o_s.part, rules/base.xml.in, symbols/capslock: added
diff --git a/rules/Makefile.am b/rules/Makefile.am
index 5cd21d7..5d6e8b4 100644
--- a/rules/Makefile.am
+++ b/rules/Makefile.am
@@ -139,6 +139,8 @@ base_parts = $(base_parts_no_compat)
 evdev_parts = $(base_parts_no_compat)
 endif
 
+base_parts_compat_dist = base.o_k.part base.lo_s.part
+
 rules_files = base evdev xfree98
 
 lst_files = base.lst evdev.lst
@@ -152,23 +154,24 @@ base: $(base_parts_no_compat)
 evdev: $(evdev_parts_no_compat)
 	HDR="$(srcdir)/HDR" $(srcdir)/merge.sh $@ $(evdev_parts)
 
-all_rules_files = $(rules_files) $(lst_files) \
-xkb.dtd README
+dist_files = xkb.dtd README
 
-rules_DATA = $(all_rules_files)
+rules_DATA = $(rules_files) $(lst_files) $(dist_files)
 
 xml_in_files = base.xml.in evdev.xml.in
 xml_DATA = $(xml_in_files:.xml.in=.xml) 
 
-evdev.xml.in: base.xml.in
+$(srcdir)/evdev.xml.in: base.xml.in
 	cp $< $@
 
-EXTRA_DIST= $(all_rules_files) $(xml_in_files) \
+EXTRA_DIST= $(xml_in_files) xfree98 \
             $(base_parts_no_compat) \
             $(evdev_parts_no_compat) \
-            xml2lst.pl merge.sh
+            $(base_parts_compat_dist) \
+            xml2lst.pl merge.sh $(dist_files)
 
-DISTCLEANFILES=base.xml base.lst evdev.xml evdev.lst
+CLEANFILES = base base.xml base.lst evdev evdev.xml evdev.lst
+MAINTAINERCLEANFILES = $(srcdir)/evdev.xml.in
 
 rulesdir = $(xkb_base)/rules
 xmldir = $(rulesdir)
diff --git a/rules/merge.sh b/rules/merge.sh
index 8dfde55..0c5187e 100755
--- a/rules/merge.sh
+++ b/rules/merge.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+INDIR=`dirname $0`
 DEST=$1
 shift
 
@@ -15,8 +16,10 @@ for i in $*; do
     echo >> $DEST;
     read hdr
     echo "$hdr" >> $DEST
+  elif test -f $i; then
+    cat $i >> $DEST || exit 1
   else
-    cat $i >> $DEST;
+    cat $INDIR/$i >> $DEST || exit 1
   fi
 done < $HDR
 
-- 
2.32.0.93.g670b81a890