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

Apply program name transformations at build-time rather than at

Browse source 
run-time.  Fixes Debian bug #696465.

* acinclude.m4 (grub_TRANSFORM): New macro.
* configure.ac: Create output variables with transformed names for
most programs.
* util/bash-completion.d/grub-completion.bash.in: Use
pre-transformed variables for program names.
* util/grub-install.in: Likewise.
* util/grub-kbdcomp.in: Likewise.
* util/grub-mkconfig.in: Likewise.
* util/grub-mkconfig_lib.in: Likewise.
* util/grub-mknetdir.in: Likewise.
* util/grub-mkrescue.in: Likewise.
* util/grub-mkstandalone.in: Likewise.
* util/grub-reboot.in: Likewise.
* util/grub-set-default.in: Likewise.
* util/powerpc/ieee1275/grub-mkrescue.in: Likewise.
* tests/util/grub-shell-tester.in: Remove unused assignment.
* tests/util/grub-shell.in: Likewise.
* util/grub.d/00_header.in: Likewise.
This commit is contained in:
Colin Watson 2012-12-28 06:57:17 +00:00
parent 7024b3c0c2
commit fd49ceb35c
17 changed files with 76 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

4
util/grub-kbdcomp.in
View file

@ -1,7 +1,5 @@
#!/bin/sh
transform="@program_transform_name@"
prefix="@prefix@"
exec_prefix="@exec_prefix@"
bindir="@bindir@"
@ -11,7 +9,7 @@ if [ "x$pkgdatadir" = x ]; then
pkgdatadir="${datadir}/@PACKAGE@"
fi
grub_mklayout="${bindir}/`echo grub-mklayout | sed ${transform}`"
grub_mklayout="${bindir}/@grub_mklayout@"
ckbcomp_options=""