xkeyboard-config ChangeLog, 1.246, 1.247 Makefile.am, 1.18, 1.19 xkbrules.am, 1.3, 1.4

Committed by: svu

Update of /cvs/xkeyboard-config/xkeyboard-config
In directory kemper:/tmp/cvs-serv15657

Modified Files:
	ChangeLog Makefile.am xkbrules.am 
Log Message:
getting rid of gmakeisms, b.fd.o#9245

Index: ChangeLog
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/ChangeLog,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -d -r1.246 -r1.247
--- ChangeLog	20 Nov 2006 23:20:57 -0000	1.246
+++ ChangeLog	7 Dec 2006 21:47:19 -0000	1.247
@@ -1,3 +1,8 @@
+2006-12-07  Sergey Udaltsov
+
+	* Makefile.am, rules/Makefile.am, xkbrules.am: getting rid of
+	gmakisms, closing https://bugs.freedesktop.org/show_bug.cgi?id=9245
+
 2006-11-20  Sergey Udaltsov
 
 	* symbols/br, keycodes/xfree86: making abnt2 more compatible with

Index: Makefile.am
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/Makefile.am,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- Makefile.am	6 Aug 2005 15:59:05 -0000	1.18
+++ Makefile.am	7 Dec 2006 21:47:19 -0000	1.19
@@ -10,7 +10,7 @@
 
 DISTCLEANFILES=intltool-extract intltool-merge intltool-update
 
-dnl ACLOCAL_AMFLAGS = -I m4
+# ACLOCAL_AMFLAGS = -I m4
 
 install-compiled:
 	rm -f $(DESTDIR)$(xkb_base)/compiled

Index: xkbrules.am
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/xkbrules.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- xkbrules.am	13 Oct 2006 21:35:02 -0000	1.3
+++ xkbrules.am	7 Dec 2006 21:47:19 -0000	1.4
@@ -8,4 +8,4 @@
 
 $(subdir).dir:
 	-rm -f $@
-	cd $(srcdir) && $(XKBCOMP) -lfhlpR -o $(CURDIR)/$@ '*'
+	here=$$(pwd); cd $(srcdir) && $(XKBCOMP) -lfhlpR -o $${here}/$@ '*'