]>
Commit | Line | Data |
---|---|---|
cc108a69 | 1 | --- burg-1.98.r1844-bzr/util/grub-install.in~ 2011-04-19 11:49:46.672680248 +0200 |
2 | +++ burg-1.98.r1844-bzr/util/grub-install.in 2011-04-19 11:56:02.052692531 +0200 | |
3 | @@ -31,7 +31,7 @@ | |
4 | platform=@platform@ | |
5 | host_os=@host_os@ | |
6 | font=@datadir@/@PACKAGE_TARNAME@/ascii.pf2 | |
7 | -pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}` | |
8 | +pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME} | sed ${transform}` | |
9 | localedir=@datadir@/locale | |
10 | ||
11 | grub_setup=${sbindir}/`echo burg-setup | sed ${transform}` | |
12 | @@ -247,23 +247,6 @@ | |
13 | exit 1 | |
14 | fi | |
15 | ||
16 | -# Copy the GRUB images to the GRUB directory. | |
17 | -for file in ${grubdir}/*.mod ${grubdir}/*.lst ${grubdir}/*.img ${grubdir}/efiemu??.o; do | |
18 | - if test -f $file && [ "`basename $file`" != menu.lst ]; then | |
19 | - rm -f $file || exit 1 | |
20 | - fi | |
21 | -done | |
22 | -for file in ${pkglibdir}/*.mod ${pkglibdir}/*.lst; do | |
23 | - cp -f $file ${grubdir} || exit 1 | |
24 | -done | |
25 | -if [ "${target_cpu}-${platform}" = "i386-pc" ] || [ "${target_cpu}-${platform}" = "sparc64-ieee1275" ] ; then | |
26 | - for file in ${pkglibdir}/*.img ${pkglibdir}/efiemu??.o; do | |
27 | - if test -f $file; then | |
28 | - cp -f $file ${grubdir} || exit 1 | |
29 | - fi | |
30 | - done | |
31 | -fi | |
32 | - | |
33 | # Copy gettext files | |
34 | mkdir -p ${grubdir}/locale/ | |
35 | for dir in ${localedir}/*; do | |
36 | --- burg-1.98.r1844-bzr/util/i386/efi/grub-install.in~ 2011-04-19 10:42:18.000000000 +0200 | |
37 | +++ burg-1.98.r1844-bzr/util/i386/efi/grub-install.in 2011-04-19 11:57:58.526029606 +0200 | |
38 | @@ -30,7 +30,7 @@ | |
39 | target_cpu=@target_cpu@ | |
40 | platform=@platform@ | |
41 | host_os=@host_os@ | |
42 | -pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}` | |
43 | +pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME} | sed ${transform}` | |
44 | localedir=@datadir@/locale | |
45 | ||
46 | grub_mkimage=${bindir}/`echo burg-mkimage | sed ${transform}` | |
47 | @@ -170,16 +170,6 @@ | |
48 | exit 1 | |
49 | fi | |
50 | ||
51 | -# Copy the GRUB images to the GRUB directory. | |
52 | -for file in ${grubdir}/*.mod ${grubdir}/*.lst; do | |
53 | - if test -f $file && [ "`basename $file`" != menu.lst ]; then | |
54 | - rm -f $file || exit 1 | |
55 | - fi | |
56 | -done | |
57 | -for file in ${pkglibdir}/*.mod ${pkglibdir}/*.lst; do | |
58 | - cp -f $file ${grubdir} || exit 1 | |
59 | -done | |
60 | - | |
61 | # Copy gettext files | |
62 | mkdir -p ${grubdir}/locale/ | |
63 | for dir in ${localedir}/*; do | |
64 | --- burg-1.98.r1844-bzr/util/ieee1275/grub-install.in~ 2011-04-19 10:42:18.000000000 +0200 | |
65 | +++ burg-1.98.r1844-bzr/util/ieee1275/grub-install.in 2011-04-19 11:59:33.736032766 +0200 | |
66 | @@ -32,7 +32,7 @@ | |
67 | PACKAGE_VERSION=@PACKAGE_VERSION@ | |
68 | target_cpu=@target_cpu@ | |
69 | platform=@platform@ | |
70 | -pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}` | |
71 | +pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME} | sed ${transform}` | |
72 | ||
73 | grub_mkimage=${bindir}/`echo burg-mkelfimage | sed ${transform}` | |
74 | grub_mkdevicemap=${sbindir}/`echo burg-mkdevicemap | sed ${transform}` | |
75 | @@ -153,16 +153,6 @@ | |
76 | $grub_mkdevicemap --device-map=$device_map $no_floppy || exit 1 | |
77 | fi | |
78 | ||
79 | -# Copy the GRUB images to the GRUB directory. | |
80 | -for file in ${grubdir}/*.mod ${grubdir}/*.lst ; do | |
81 | - if test -f $file; then | |
82 | - rm -f $file || exit 1 | |
83 | - fi | |
84 | -done | |
85 | -for file in ${pkglibdir}/*.mod ${pkglibdir}/*.lst ; do | |
86 | - cp -f $file ${grubdir} || exit 1 | |
87 | -done | |
88 | - | |
89 | if ! test -f ${grubdir}/burgenv; then | |
90 | $grub_editenv ${grubdir}/burgenv create | |
91 | fi |