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

Handle newer autotools. Add some missing quotes while on it.

Browse source 
* Makefile.am (pkglib_DATA): Remove update-grub_lib.
	(pkglib_DATA): Move grub-mkconfig_lib from here ...
	(pkgdata_DATA): ... here.
	* Makefile.util.def (update-grub_lib): Removed.
	* conf/Makefile.common (pkglib_DATA): Removed.
	(pkglib_SCRIPTS): Likewise.
	(pkgdata_DATA): New variable.
	* tests/util/grub-shell-tester.in: Replace pkglib with pkgdata where
	needed.
	Add missing quotes.
	Remove unused variable while on it.
	* tests/util/grub-shell.in: Likewise.
	* util/grub-install.in: Likewise.
	* util/grub-mkconfig.in: Likewise.
	* util/grub-mknetdir.in: Likewise.
	* util/grub-mkrescue.in: Likewise.
	* util/grub-mkstandalone.in: Likewise.
	* util/grub.d/00_header.in: Likewise.
	* util/grub.d/10_hurd.in: Likewise.
	* util/grub.d/10_illumos.in: Likewise.
	* util/grub.d/10_kfreebsd.in: Likewise.
	* util/grub.d/10_linux.in: Likewise.
	* util/grub.d/10_netbsd.in: Likewise.
	* util/grub.d/10_windows.in: Likewise.
	* util/grub.d/20_linux_xen.in: Likewise.
	* util/grub.d/30_os-prober.in: Likewise.
	* util/update-grub_lib.in: Removed.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-01-24 13:17:36 +01:00
parent e555f379be
commit 48b391e9ab
21 changed files with 151 additions and 157 deletions
Download patch file Download diff file Expand all files Collapse all files

25
util/grub-mkconfig.in
View file

@ -18,25 +18,26 @@ set -e
# along with GRUB. If not, see <http://www.gnu.org/licenses/>.
transform="@program_transform_name@"
prefix="@prefix@"
exec_prefix="@exec_prefix@"
datarootdir="@datarootdir@"
prefix=@prefix@
exec_prefix=@exec_prefix@
sbindir=@sbindir@
bindir=@bindir@
libdir=@libdir@
sysconfdir=@sysconfdir@
prefix="@prefix@"
exec_prefix="@exec_prefix@"
sbindir="@sbindir@"
bindir="@bindir@"
sysconfdir="@sysconfdir@"
PACKAGE_NAME=@PACKAGE_NAME@
PACKAGE_VERSION=@PACKAGE_VERSION@
host_os=@host_os@
datarootdir=@datarootdir@
datadir=@datadir@
pkgdatadir=${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`
datadir="@datadir@"
pkgdatadir="${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`"
grub_cfg=""
grub_mkconfig_dir=${sysconfdir}/grub.d
grub_mkconfig_dir="${sysconfdir}"/grub.d
self=`basename $0`
grub_probe=${sbindir}/`echo grub-probe | sed "${transform}"`
grub_probe="${sbindir}/`echo grub-probe | sed "${transform}"`"
grub_script_check="${bindir}/`echo grub-script-check | sed "${transform}"`"
GRUB_PREFIX=`echo '/@bootdirname@/@grubdirname@' | sed "s,//*,/,g"`
@ -94,7 +95,7 @@ do
esac
done
. ${libdir}/@PACKAGE@/grub-mkconfig_lib
. "${datadir}/@PACKAGE@/grub-mkconfig_lib"
if [ "x$EUID" = "x" ] ; then
EUID=`id -u`