* conf/Makefile.common (grubdatadir): Removed.
(Makefile.am): Move eveything grubdata to pkgdata.
This commit is contained in:
parent
4b59234df8
commit
3d68bffbb7
3 changed files with 6 additions and 2 deletions
|
@ -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>
|
2012-02-22 Vladimir Serbinenko <phcoder@gmail.com>
|
||||||
|
|
||||||
* grub-core/commands/acpihalt.c (get_sleep_type):
|
* grub-core/commands/acpihalt.c (get_sleep_type):
|
||||||
|
|
|
@ -62,7 +62,7 @@ CLEANFILES += grub_fstest_init.c
|
||||||
|
|
||||||
if COND_GRUB_MKFONT
|
if COND_GRUB_MKFONT
|
||||||
if COND_HAVE_FONT_SOURCE
|
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
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
|
@ -99,7 +99,6 @@ CCASFLAGS_LIBRARY =
|
||||||
# Other variables
|
# Other variables
|
||||||
|
|
||||||
grubconfdir = $(sysconfdir)/grub.d
|
grubconfdir = $(sysconfdir)/grub.d
|
||||||
grubdatadir = $(datadir)/`echo @PACKAGE_TARNAME@ | sed '$(transform)'`
|
|
||||||
platformdir = $(pkglibrootdir)/$(target_cpu)-$(platform)
|
platformdir = $(pkglibrootdir)/$(target_cpu)-$(platform)
|
||||||
|
|
||||||
CFLAGS_GCRY = -Wno-error -Wno-missing-field-initializers
|
CFLAGS_GCRY = -Wno-error -Wno-missing-field-initializers
|
||||||
|
|
Loading…
Add table
Reference in a new issue