From: Manoel R. Abranches Date: Fri, 27 May 2011 03:23:33 +0000 (-0300) Subject: Merge Mainline. X-Git-Tag: 2.00~1195^2~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85fd555441fb07b28f4ed38b5426e742b81fc38f;p=thirdparty%2Fgrub.git Merge Mainline. --- 85fd555441fb07b28f4ed38b5426e742b81fc38f diff --cc grub-core/Makefile.am index d5cd25a70,98e275f7e..a8862b309 --- a/grub-core/Makefile.am +++ b/grub-core/Makefile.am @@@ -147,9 -164,13 +166,14 @@@ KERNEL_HEADER_FILES += $(top_srcdir)/in KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/lib/arg.h endif + if COND_mips_qemu_mips + KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h + KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/kernel.h + endif + if COND_powerpc_ieee1275 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/ieee1275/ieee1275.h +KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/ieee1275/ofnet.h KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/terminfo.h KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/extcmd.h KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/lib/arg.h