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

(Makefile.am): Move eveything grubdata to pkgdata.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-02-22 16:27:39 +01:00
parent 4b59234df8
commit 3d68bffbb7
3 changed files with 6 additions and 2 deletions

View file

@ -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):

View file

@ -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

View file

@ -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