From mboxrd@z Thu Jan 1 00:00:00 1970 From: md@Linux.IT (Marco d'Itri) Date: Mon, 09 Nov 2009 03:46:09 +0000 Subject: more fixes for out of tree builds Message-Id: <20091109034609.GA28618@bongo.bofh.it> MIME-Version: 1 Content-Type: multipart/mixed; boundary="y0ulUmNC+osPPQO6" List-Id: To: linux-hotplug@vger.kernel.org --y0ulUmNC+osPPQO6 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline These are needed to support out of tree builds, but I do not know the correct way to properly fix the bugs in Makefile.am. -- ciao, Marco --y0ulUmNC+osPPQO6 Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=fix-builddir-gtk-doc --- a/extras/gudev/docs/Makefile.in +++ b/extras/gudev/docs/Makefile.in @@ -300,6 +300,7 @@ GPATH = $(srcdir) TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) # This includes the standard gtk-doc make rules, copied by gtkdocize. +srcdir := $(builddir) # Other files to distribute # e.g. EXTRA_DIST += version.xml.in --- a/libudev/docs/Makefile.in +++ b/libudev/docs/Makefile.in @@ -292,6 +292,7 @@ GPATH = $(srcdir) TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) # This includes the standard gtk-doc make rules, copied by gtkdocize. +srcdir := $(builddir) # Other files to distribute # e.g. EXTRA_DIST += version.xml.in --y0ulUmNC+osPPQO6 Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=fix-builddir-keymap --- a/Makefile.in +++ b/Makefile.in @@ -2912,6 +2912,7 @@ install-data-local: @ENABLE_EXTRAS_TRUE@ ln -sf $(libexecdir)/udev-acl $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d/udev-acl.ck @ENABLE_EXTRAS_TRUE@extras/keymap/keys.txt: /usr/include/linux/input.h +@ENABLE_EXTRAS_TRUE@ @$(MKDIR_P) extras/keymap @ENABLE_EXTRAS_TRUE@ $(AM_V_GEN)$(AWK) '/^#define.*KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' < $< | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@ @ENABLE_EXTRAS_TRUE@extras/keymap/keys-from-name.gperf: extras/keymap/keys.txt --y0ulUmNC+osPPQO6--