* Makefile.in (RMKFILES): Search in srcdir and not current directory.

	(MAINTAINER_CLEANFILES): Don't add $(srcdir) to MKFILES. Add few
	missing files.
	(maintainer-clean): Remove libgcrypt-grub.

diff --git a/ChangeLog b/ChangeLog
index 820b595edbdda4a3a750f7d4c5146b08bda3f9e5..3313a4911bd4dfe393566088d34f9a7e4bb1968c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-04-09  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * Makefile.in (RMKFILES): Search in srcdir and not current directory.
+       (MAINTAINER_CLEANFILES): Don't add $(srcdir) to MKFILES. Add few
+       missing files.
+       (maintainer-clean): Remove libgcrypt-grub.
+
 2010-04-09  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * term/efi/console.c (grub_console_checkkey): Macroify key contants.

diff --git a/Makefile.in b/Makefile.in
index d5eda4be362df47c18ec15126a30e2fd1bb04c41..57af32cfc04700a76152a3ff820f491343c8fda1 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -136,7 +136,7 @@ enable_efiemu = @enable_efiemu@
 
 ### General variables.
 
-RMKFILES = $(wildcard conf/*.rmk)
+RMKFILES = $(wildcard $(srcdir)/conf/*.rmk)
 
 MKFILES = $(patsubst %.rmk,%.mk,$(RMKFILES))
 
@@ -155,7 +155,9 @@ DISTCLEANFILES = config.status config.cache config.log config.h \
        gensymlist.sh genkernsyms.sh build_env.mk \
        docs/grub.info docs/version.texi docs/stamp-vti
 
-MAINTAINER_CLEANFILES = $(srcdir)/configure $(addprefix $(srcdir)/,$(MKFILES)) \
+MAINTAINER_CLEANFILES = $(srcdir)/configure $(srcdir)/aclocal.m4 \
+       $(MKFILES) $(srcdir)/config.guess \
+       $(srcdir)/config.sub $(srcdir)/install-sh $(srcdir)/missing \
        $(srcdir)/DISTLIST $(srcdir)/config.h.in $(srcdir)/stamp-h.in $(INFOS)
 
 # The default target.
@@ -427,6 +429,8 @@ distclean: mostlyclean
 
 maintainer-clean: distclean
        -test -z "$(MAINTAINER_CLEANFILES)" || rm -f $(MAINTAINER_CLEANFILES)
+       -rmdir $(srcdir)/lib/libgcrypt-grub/cipher
+       -rmdir $(srcdir)/lib/libgcrypt-grub
 
 info: