2008-05-13  Lubomir Rintel  <address@hidden>

	* Makefile.in (DISTLIST): Sort the whole DISTLIST.
	(.PHONY) Make DISTLIST a phony target.
	* gendistlist.sh (EXTRA_DISTFILES): Add missing files.
	(DISTDIRS): Add missing directories.
	(top level): Add matches to more suffixes, and remove
	partial sort of results.	

Index: Makefile.in
===================================================================
RCS file: /sources/grub/grub2/Makefile.in,v
retrieving revision 1.35
diff -u -p -r1.35 Makefile.in
--- Makefile.in	25 Apr 2008 19:41:48 -0000	1.35
+++ Makefile.in	13 May 2008 06:37:06 -0000
@@ -259,7 +259,7 @@ dvi:
 distdir=$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
 
 DISTLIST: gendistlist.sh
-	sh $(srcdir)/gendistlist.sh > $(srcdir)/DISTLIST
+	sh $(srcdir)/gendistlist.sh | sort > $(srcdir)/DISTLIST
 
 distdir: DISTLIST
 	-chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
@@ -334,7 +334,7 @@ genkernsyms.sh: genkernsyms.sh.in config
 	./config.status
 
 .PHONY: all install install-strip uninstall clean mostlyclean distclean
-.PHONY: maintainer-clean info dvi dist check
+.PHONY: maintainer-clean info dvi dist check DISTLIST
 
 # Prevent an overflow.
 .NOEXPORT:
Index: gendistlist.sh
===================================================================
RCS file: /sources/grub/grub2/gendistlist.sh,v
retrieving revision 1.3
diff -u -p -r1.3 gendistlist.sh
--- gendistlist.sh	13 Apr 2008 10:55:19 -0000	1.3
+++ gendistlist.sh	13 May 2008 06:37:07 -0000
@@ -16,11 +16,13 @@
 EXTRA_DISTFILES="AUTHORS COPYING ChangeLog DISTLIST INSTALL NEWS README \
 	THANKS TODO Makefile.in aclocal.m4 autogen.sh config.guess \
 	config.h.in config.sub configure configure.ac gencmdlist.sh \
-	gendistlist.sh genfslist.sh genpartmaplist.sh genkernsyms.sh genmk.rb \
-	genmodsrc.sh gensymlist.sh install-sh mkinstalldirs stamp-h.in"
+	gendistlist.sh genfslist.sh genpartmaplist.sh genkernsyms.sh.in genmk.rb \
+	genmodsrc.sh gensymlist.sh.in install-sh mkinstalldirs stamp-h.in \
+	geninitheader.sh geninit.sh genmoddep.awk \
+        docs/grub.cfg docs/mdate-sh docs/texinfo.tex"
 
-DISTDIRS="boot commands conf disk font fs hello include io kern loader \
-	normal partmap term util video"
+DISTDIRS="boot bus commands conf disk docs font fs hello include io kern \
+	loader normal partmap term util video"
 
 for f in $EXTRA_DISTFILES; do
     echo $f
@@ -31,8 +33,7 @@ cd $dir
 
 for dir in $DISTDIRS; do
   for d in `find $dir -type d | sort`; do
-    find $d -maxdepth 1 -name '*.[chS]' -o -name '*.mk' -o -name '*.rmk' \
-      -o -name '*.rb' -o -name '*.in' \
-      | sort
+    find $d -maxdepth 1 -name '*.[chSy]' -o -name '*.mk' -o -name '*.rmk' \
+      -o -name '*.rb' -o -name '*.in' -o -name 'README' -o -name '*.texi'
   done
 done