* configure.ac: Remove inappropriate use of program_transform_name

	on grubdir and bootdir but allow explicit specification of those
	variables.

diff --git a/ChangeLog b/ChangeLog
index c28f0891ecbe36ac57e2db017619cacaa797378a..87e89b4c448be6c528dcbe8e1c7495a0502e597c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * util/grub-mknetdir.in (grub_prefix): Removed.

diff --git a/configure.ac b/configure.ac
index 6423ad0223afd9154b04d92970d80171b7285cfe..608ac683f010df6344169db9955639e15de7762a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -191,18 +191,34 @@ AC_SUBST(target_cpu)
 AC_SUBST(platform)
 
 # 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,
-        bootdirname=''      ;;
-  *)    bootdirname='boot'  ;;
-esac
-bootdirname=`echo "$bootdirname" | sed "$program_transform_name"`
+           bootdirname=''      ;;
+     *)    bootdirname='boot'  ;;
+   esac
+fi
+
 AC_SUBST(bootdirname)
 AC_DEFINE_UNQUOTED(GRUB_BOOT_DIR_NAME, "$bootdirname",
     [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_DEFINE_UNQUOTED(GRUB_DIR_NAME, "$grubdirname",
     [Default grub directory name])