2007-12-25 Robert Millan <rmh@aybabtu.com>
* configure.ac: Search for possible unifont.hex locations, and define UNIFONT_HEX if found. * Makefile.in (UNIFONT_HEX): Define variable. (DATA): Rename to ... (PKGLIB): ... this. Update all users. (PKGDATA): New variable. (pkgdata_IMAGES): Rename to ... (pkglib_IMAGES): ... this. Update all users. (pkgdata_MODULES): Rename to ... (pkglib_MODULES): ... this. Update all users. (pkgdata_PROGRAMS): Rename to ... (pkglib_PROGRAMS): ... this. Update all users. (pkgdata_DATA): Rename to ... (pkglib_DATA): ... this. Update all users. (CLEANFILES): Redefine to `$(pkglib_DATA) $(pkgdata_DATA)'. (unicode.pff, ascii.pff): New rules. (all-local): Add `$(PKGDATA)' dependency. (install-local): Process `$(PKGDATA)'. * util/update-grub_lib.in (font_path): Search for *.pff files in a few more locations, including `${pkgdata}'.
This commit is contained in:
parent
57e57e3167
commit
4931827fe4
17 changed files with 113 additions and 42 deletions
12
configure
vendored
12
configure
vendored
|
@ -667,6 +667,7 @@ target_os
|
|||
platform
|
||||
CMP
|
||||
YACC
|
||||
UNIFONT_HEX
|
||||
INSTALL_PROGRAM
|
||||
INSTALL_SCRIPT
|
||||
INSTALL_DATA
|
||||
|
@ -2071,6 +2072,14 @@ echo "$as_me: error: bison is not found" >&2;}
|
|||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
|
||||
for file in /usr/share/unifont/unifont.hex ; do
|
||||
if test -e $file ; then
|
||||
UNIFONT_HEX=$file
|
||||
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
||||
# Find a good install program. We prefer a C program (faster),
|
||||
# so one script is as good as another. But avoid the broken or
|
||||
# incompatible versions:
|
||||
|
@ -8817,6 +8826,7 @@ target_os!$target_os$ac_delim
|
|||
platform!$platform$ac_delim
|
||||
CMP!$CMP$ac_delim
|
||||
YACC!$YACC$ac_delim
|
||||
UNIFONT_HEX!$UNIFONT_HEX$ac_delim
|
||||
INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
|
||||
INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
|
||||
INSTALL_DATA!$INSTALL_DATA$ac_delim
|
||||
|
@ -8848,7 +8858,7 @@ LIBOBJS!$LIBOBJS$ac_delim
|
|||
LTLIBOBJS!$LTLIBOBJS$ac_delim
|
||||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 81; then
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 82; then
|
||||
break
|
||||
elif $ac_last_try; then
|
||||
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue