From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lennart Poettering Date: Thu, 29 Oct 2009 15:03:26 +0000 Subject: Re: [PATCH] extras/keymap: fix build (GEN keys.txt) Message-Id: <20091029150326.GA31996@tango.0pointer.de> List-Id: References: <4AE9A648.2090006@tuffmail.co.uk> In-Reply-To: <4AE9A648.2090006@tuffmail.co.uk> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-hotplug@vger.kernel.org On Thu, 29.10.09 14:27, Alan Jenkins (alan-jenkins@tuffmail.co.uk) wrote: > Commit 7d701b0 "Merge keymap building in the top-level Makefile.am" > caused a build failure when extras are enabled. > > Fix the generation of keys.txt by reverting to the original command. > -extras/keymap/keys.txt: /usr/include/linux/input.h > - $(AM_V_GEN)$(AWK) '/^#define.*KEY_[^ ]+[[:space:]]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' < $< | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@ > +extras/keymap/keys.txt: /usr/include/linux/input.h Makefile > + $(AM_V_GEN)$(AWK) '/^#define.*KEY_/ { if ($$2 != "KEY_MAX" && > $$2 != "KEY_CNT") { print $$2 } }' < $< > $@ The s/^KEY_COFFEE$$/KEY_SCREENLOCK/ you dropped here actually matters. It needs to be kept. Lennart -- Lennart Poettering Red Hat, Inc. lennart [at] poettering [dot] net http://0pointer.net/lennart/ GnuPG 0x1A015CC4