* conf/Makefile.common (grubdatadir): Removed.

	(Makefile.am): Move eveything grubdata to pkgdata.

diff --git a/ChangeLog b/ChangeLog
index c66fcb482540f7574db3100c4e51535b75607596..d4d6e84fa9aa37503acc7e4a8e7a6807d6e91140 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-22  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * conf/Makefile.common (grubdatadir): Removed.
+       (Makefile.am): Move eveything grubdata to pkgdata.
+
 2012-02-22  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/commands/acpihalt.c (get_sleep_type):

diff --git a/Makefile.am b/Makefile.am
index 24bf9f86afb2723b5aa928591961dd8c772b0477..6f17e8079ca5944e0d9d8407143113fe2448aec1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -62,7 +62,7 @@ CLEANFILES += grub_fstest_init.c
 
 if COND_GRUB_MKFONT
 if COND_HAVE_FONT_SOURCE
-grubdata_DATA = unicode.pf2 ascii.pf2 euro.pf2 ascii.h widthspec.h
+pkgdata_DATA += unicode.pf2 ascii.pf2 euro.pf2 ascii.h widthspec.h
 endif
 endif
 

diff --git a/conf/Makefile.common b/conf/Makefile.common
index b960bdf81d982c7e89b38daa997f3a804245d664..2f5def49d4d44c7737eae09972aa8b4fabb380f9 100644 (file)
--- a/conf/Makefile.common
+++ b/conf/Makefile.common
@@ -99,7 +99,6 @@ CCASFLAGS_LIBRARY =
 # Other variables
 
 grubconfdir = $(sysconfdir)/grub.d
-grubdatadir = $(datadir)/`echo @PACKAGE_TARNAME@ | sed '$(transform)'`
 platformdir = $(pkglibrootdir)/$(target_cpu)-$(platform)
 
 CFLAGS_GCRY = -Wno-error -Wno-missing-field-initializers