From 8151bc82f7580a167c16031ba6149c92a05eb133 Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Mon, 27 Feb 2012 10:35:37 +0100 Subject: [PATCH] Remove improper use of program_transform_name on pkglibrootdir. * configure.ac (pkglibrootdir): Removed. (grub-mkimage): Replace PKGLIBROOTDIR with PKGLIBDIR. * util/grub-mkimage.c: Likewise. --- ChangeLog | 10 +++++++++- Makefile.util.def | 2 +- configure.ac | 3 --- util/grub-mkimage.c | 12 ++++++------ 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 76e40dc1a..d3ef57af0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2012-02-27 Vladimir Serbinenko + + 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 * 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 +2012-02-27 Vladimir Serbinenko * conf/Makefile.common (platformdir): Base on pkglibdir and not pkglibrootdir. diff --git a/Makefile.util.def b/Makefile.util.def index 03d2187f0..36e46e4a2 100644 --- 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 d27195587..6423ad022 100644 --- 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 91dfaaeb4..76c4aaa8a 100644 --- 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); }