Remove improper use of program_transform_name on pkglibrootdir.

	* configure.ac (pkglibrootdir): Removed.
	(grub-mkimage): Replace PKGLIBROOTDIR with PKGLIBDIR.
	* util/grub-mkimage.c: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 76e40dc1add2af1b6252c356c3f87068b8471c92..d3ef57af0bfac4995fef22579a74bcd5f87d85e9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-02-27  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       Remove improper use of program_transform_name on pkglibrootdir.
+
+       * configure.ac (pkglibrootdir): Removed.
+       (grub-mkimage): Replace PKGLIBROOTDIR with PKGLIBDIR.
+       * util/grub-mkimage.c: Likewise.
+
 2012-02-27  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/normal/menu_text.c (grub_print_message_indented_real): Fix a
@@ -15,7 +23,7 @@
        (grub_freebsd_boot): Pass zfs UUID.
        (grub_cmd_freebsd): Set zfs UUID.
 
-2012-02-27  Mike Gilbert  <floppym@gentoo.org>
+2012-02-27  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * conf/Makefile.common (platformdir): Base on pkglibdir and not
        pkglibrootdir.

diff --git a/Makefile.util.def b/Makefile.util.def
index 03d2187f0bcc364af2d3ea3a32881e71b61e22c3..36e46e4a2425153468498476d9a7e0cad3670937 100644 (file)
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -152,7 +152,7 @@ program = {
   ldadd = grub-core/gnulib/libgnu.a;
   ldadd = '$(LIBLZMA)';
   ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
-  cppflags = '-DGRUB_PKGLIBROOTDIR=\"$(pkglibrootdir)\"';
+  cppflags = '-DGRUB_PKGLIBDIR=\"$(pkglibdir)\"';
 };
 
 program = {

diff --git a/configure.ac b/configure.ac
index d271955874083add1453e400ef156149020c85e5..6423ad0223afd9154b04d92970d80171b7285cfe 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1049,9 +1049,6 @@ AC_SUBST([LIBNVPAIR])
 
 LIBS=""
 
-pkglibrootdir='$(libdir)'/`echo $PACKAGE | sed "$program_transform_name"`
-AC_SUBST(pkglibrootdir)
-
 AC_SUBST([FONT_SOURCE])
 AS_IF([test x$target_cpu = xi386 -a x$platform = xqemu],
            [AC_SUBST([GRUB_BOOT_MACHINE_LINK_ADDR], 0xffe00)])

diff --git a/util/grub-mkimage.c b/util/grub-mkimage.c
index 91dfaaeb4083cfedcfba4151ec116214f929563e..76c4aaa8aba7036be0f80644919787788cdd5b8d 100644 (file)
--- a/util/grub-mkimage.c
+++ b/util/grub-mkimage.c
@@ -1663,7 +1663,7 @@ help_filter (int key, const char *text, void *input __attribute__ ((unused)))
   switch (key)
     {
     case 'd':
-      return xasprintf (text, GRUB_PKGLIBROOTDIR);
+      return xasprintf (text, GRUB_PKGLIBDIR);
     case 'p':
       return xasprintf (text, DEFAULT_DIRECTORY);
     case 'O':
@@ -1861,13 +1861,13 @@ main (int argc, char *argv[])
 
   if (!arguments.dir)
     {
-      arguments.dir = xmalloc (sizeof (GRUB_PKGLIBROOTDIR)
+      arguments.dir = xmalloc (sizeof (GRUB_PKGLIBDIR)
                               + grub_strlen (arguments.image_target->dirname)
                               + 1);
-      memcpy (arguments.dir, GRUB_PKGLIBROOTDIR,
-             sizeof (GRUB_PKGLIBROOTDIR) - 1);
-      *(arguments.dir + sizeof (GRUB_PKGLIBROOTDIR) - 1) = '/';
-      strcpy (arguments.dir + sizeof (GRUB_PKGLIBROOTDIR),
+      memcpy (arguments.dir, GRUB_PKGLIBDIR,
+             sizeof (GRUB_PKGLIBDIR) - 1);
+      *(arguments.dir + sizeof (GRUB_PKGLIBDIR) - 1) = '/';
+      strcpy (arguments.dir + sizeof (GRUB_PKGLIBDIR),
              arguments.image_target->dirname);
     }