fixed distcheck

diff --git a/Makefile.am b/Makefile.am
index 09c2fa43e293654e1282fa619084a2b43ac1ee3a..e96a540da4dd48affa83da023569d1fffe08d94f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,6 @@
 AUTOMAKE_OPTIONS = subdir-objects
 
+DEPDIR = .deps-util
 SUBDIRS = . grub-core po docs
 EXTRA_DIST = autogen.sh gentpl.py Makefile.tpl modules.def geninit.sh
 EXTRA_DIST += include conf/i386-pc-cygwin-img-ld.sc
@@ -152,7 +153,6 @@ CLEANFILES += ascii.bitmaps
 
 ascii.h: ascii.bitmaps grub-bin2h
        $(builddir)/grub-bin2h ascii_bitmaps < $< > $@
-       cp $@ $(top_builddir)/grub-core/include
 CLEANFILES += ascii.h $(top_builddir)/grub-core/include/ascii.h
 
 widthspec.bin: $(FONT_SOURCE) grub-mkfont

diff --git a/configure.ac b/configure.ac
index 23988a17e6dd39fb781880fc2101482d13d103e2..c0cd11b65c394375e876f0971cf9f9d6baabceb2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -37,9 +37,7 @@ fi
 
 # Default HOST_CPPFLAGS
 HOST_CPPFLAGS="$HOST_CPPFLAGS -Wall -W"
-HOST_CPPFLAGS="$HOST_CPPFLAGS -I\$(top_srcdir)/grub-core/include"
 HOST_CPPFLAGS="$HOST_CPPFLAGS -I\$(top_builddir)/include"
-HOST_CPPFLAGS="$HOST_CPPFLAGS -I\$(top_srcdir)/grub-core/gnulib"
 HOST_CPPFLAGS="$HOST_CPPFLAGS -DGRUB_UTIL=1"
 HOST_CPPFLAGS="$HOST_CPPFLAGS -DGRUB_LIBDIR=\\\"\$(pkglibdir)\\\""
 HOST_CPPFLAGS="$HOST_CPPFLAGS -DLOCALEDIR=\\\"\$(localedir)\\\""

diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
index efce4d22ebbfefd0804c5649bef011663d11bc7d..e1f45eb388a41198dfbd4c3453170c2b1140f6f3 100644 (file)
--- a/grub-core/Makefile.am
+++ b/grub-core/Makefile.am
@@ -3,6 +3,7 @@ AUTOMAKE_OPTIONS = subdir-objects
 CC=$(TARGET_CC)
 CPP=$(TARGET_CC)
 CCAS=$(TARGET_CC)
+DEPDIR=.deps-core
 
 EXTRA_DIST =
 EXTRA_DIST += modules.def genmoddep.awk