vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* configure.ac: Remove inappropriate use of program_transform_name

Browse source 
on grubdir and bootdir but allow explicit specification of those
	variables.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-02-27 11:34:31 +01:00
parent 6a3131243a
commit 7134247cd8
2 changed files with 29 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2012-02-27 Vladimir Serbinenko <phcoder@gmail.com>
* configure.ac: Remove inappropriate use of program_transform_name
on grubdir and bootdir but allow explicit specification of those
variables.
2012-02-27 Vladimir Serbinenko <phcoder@gmail.com> 2012-02-27 Vladimir Serbinenko <phcoder@gmail.com>
* util/grub-mknetdir.in (grub_prefix): Removed. * util/grub-mknetdir.in (grub_prefix): Removed.

30
configure.ac
View file

@ -191,18 +191,34 @@ AC_SUBST(target_cpu)
AC_SUBST(platform) AC_SUBST(platform)
# Define default variables # Define default variables
case "$host_os" in
netbsd* | openbsd*) have_with_bootdir=n
AC_ARG_WITH([bootdir],
AS_HELP_STRING([--with-bootdir=DIR],
[set the name of /boot directory [[guessed]]]),
[have_with_bootdir=y],
[have_with_bootdir=n])
if test x$have_with_bootdir = xy; then
bootdirname="$with_bootdir"
else
case "$host_os" in
netbsd* | openbsd*)
# Because /boot is used for the boot block in NetBSD and OpenBSD, # Because /boot is used for the boot block in NetBSD and OpenBSD,
bootdirname='' ;; bootdirname='' ;;
*) bootdirname='boot' ;; *) bootdirname='boot' ;;
esac esac
bootdirname=`echo "$bootdirname" | sed "$program_transform_name"` fi
AC_SUBST(bootdirname) AC_SUBST(bootdirname)
AC_DEFINE_UNQUOTED(GRUB_BOOT_DIR_NAME, "$bootdirname", AC_DEFINE_UNQUOTED(GRUB_BOOT_DIR_NAME, "$bootdirname",
[Default boot directory name]") [Default boot directory name]")
grubdirname=`echo "$PACKAGE" | sed "$program_transform_name"` AC_ARG_WITH([grubdir],
AS_HELP_STRING([--with-grubdir=DIR],
[set the name of grub directory [[guessed]]]),
[grubdirname="$with_grubdir"],
[grubdirname="$PACKAGE"])
AC_SUBST(grubdirname) AC_SUBST(grubdirname)
AC_DEFINE_UNQUOTED(GRUB_DIR_NAME, "$grubdirname", AC_DEFINE_UNQUOTED(GRUB_DIR_NAME, "$grubdirname",
[Default grub directory name]) [Default grub directory name])