* conf/common.rmk (grub_mkisofs_CFLAGS): Move `-I$(srcdir)/gnulib'

        from here ...
        * Makefile.in (CPPFLAGS): ... to here.

diff --git a/ChangeLog.gettext b/ChangeLog.gettext
index 402d93250da1249943c5f98abf8331f36eedbc70..966bf8e7d18ddbd526f580462311f79b984f176c 100644 (file)
--- a/ChangeLog.gettext
+++ b/ChangeLog.gettext
@@ -4,3 +4,7 @@
        * acinclude.m4: ... to here.
        * autogen.sh: Add call to `aclocal'.
        * configure.ac: Add AM_INIT_AUTOMAKE() after AC_INIT() call.
+
+       * conf/common.rmk (grub_mkisofs_CFLAGS): Move `-I$(srcdir)/gnulib'
+       from here ...
+       * Makefile.in (CPPFLAGS): ... to here.

diff --git a/Makefile.in b/Makefile.in
index 6f08d5a6fbdc32fa1f78dddc91ce7118ae5857af..3a4c158c6bdc77285097aff8ee9a38cfccbbe0ba 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -71,7 +71,7 @@ CC = @CC@
 CFLAGS = @CFLAGS@
 ASFLAGS = @ASFLAGS@
 LDFLAGS = @LDFLAGS@
-CPPFLAGS = @CPPFLAGS@ -I$(builddir) -I$(builddir)/include -I$(srcdir)/include -Wall -W \
+CPPFLAGS = @CPPFLAGS@ -I$(builddir) -I$(builddir)/include -I$(srcdir)/gnulib -I$(srcdir)/include -Wall -W \
         -DGRUB_LIBDIR=\"$(pkglibdir)\"
 TARGET_CC = @TARGET_CC@
 TARGET_CFLAGS = @TARGET_CFLAGS@

diff --git a/conf/common.rmk b/conf/common.rmk
index a66bd97fd35afebdf003b14ed2f376ce06b20546..57b47a6690681fcdfdead82eaa044b3b11057a97 100644 (file)
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -38,7 +38,7 @@ grub_mkisofs_SOURCES = util/mkisofs/eltorito.c                                \
        \
        gnulib/fnmatch.c gnulib/getopt1.c gnulib/getopt.c
 grub_mkisofs_CFLAGS = -D_FILE_OFFSET_BITS=64                           \
-       -I$(srcdir)/util/mkisofs/include -I$(srcdir)/gnulib             \
+       -I$(srcdir)/util/mkisofs/include                                \
        -Wno-all -Werror
 
 # For grub-fstest.