]>
Commit | Line | Data |
---|---|---|
cc108a69 | 1 | --- burg-1.98.r1844-bzr/util/grub.d/00_header.in~ 2011-04-19 10:42:18.000000000 +0200 |
2 | +++ burg-1.98.r1844-bzr/util/grub.d/00_header.in 2011-04-19 11:42:02.029331593 +0200 | |
3 | @@ -27,7 +27,7 @@ | |
4 | sysconfdir=@sysconfdir@ | |
5 | pass_file=${sysconfdir}/default/burg-passwd | |
6 | ||
7 | -. ${libdir}/burg/burg-mkconfig_lib | |
8 | +. /lib/burg-mkconfig_lib | |
9 | ||
10 | # Do this as early as possible, since other commands might depend on it. | |
11 | # (e.g. the `loadfont' command might need lvm or raid modules) | |
12 | --- burg-1.98.r1844-bzr/util/grub.d/10_hurd.in~ 2011-04-19 10:42:18.000000000 +0200 | |
13 | +++ burg-1.98.r1844-bzr/util/grub.d/10_hurd.in 2011-04-19 11:44:20.972669603 +0200 | |
14 | @@ -19,7 +19,7 @@ | |
15 | prefix=@prefix@ | |
16 | exec_prefix=@exec_prefix@ | |
17 | libdir=@libdir@ | |
18 | -. ${libdir}/burg/burg-mkconfig_lib | |
19 | +. /lib/burg-mkconfig_lib | |
20 | ||
21 | CLASS="--class gnu --class os" | |
22 | ||
23 | --- burg-1.98.r1844-bzr/util/grub.d/10_linux.in~ 2011-04-19 11:33:43.929315411 +0200 | |
24 | +++ burg-1.98.r1844-bzr/util/grub.d/10_linux.in 2011-04-19 11:45:07.839337671 +0200 | |
25 | @@ -20,7 +20,7 @@ | |
26 | exec_prefix=@exec_prefix@ | |
27 | bindir=@bindir@ | |
28 | libdir=@libdir@ | |
29 | -. ${libdir}/burg/burg-mkconfig_lib | |
30 | +. /lib/burg-mkconfig_lib | |
31 | ||
32 | export TEXTDOMAIN=@PACKAGE@ | |
33 | export TEXTDOMAINDIR=@localedir@ | |
34 | --- burg-1.98.r1844-bzr/util/grub.d/10_windows.in~ 2011-04-19 10:42:18.000000000 +0200 | |
35 | +++ burg-1.98.r1844-bzr/util/grub.d/10_windows.in 2011-04-19 11:45:53.182672563 +0200 | |
36 | @@ -19,7 +19,7 @@ | |
37 | prefix=@prefix@ | |
38 | exec_prefix=@exec_prefix@ | |
39 | libdir=@libdir@ | |
40 | -. ${libdir}/burg/burg-mkconfig_lib | |
41 | +. /lib/burg-mkconfig_lib | |
42 | ||
43 | case "`uname 2>/dev/null`" in | |
44 | CYGWIN*) ;; | |
45 | --- burg-1.98.r1844-bzr/util/grub.d/30_os-prober.in~ 2011-04-19 10:42:18.000000000 +0200 | |
46 | +++ burg-1.98.r1844-bzr/util/grub.d/30_os-prober.in 2011-04-19 11:46:25.046007009 +0200 | |
47 | @@ -20,7 +20,7 @@ | |
48 | exec_prefix=@exec_prefix@ | |
49 | libdir=@libdir@ | |
50 | ||
51 | -. ${libdir}/burg/burg-mkconfig_lib | |
52 | +. /lib/burg-mkconfig_lib | |
53 | ||
54 | if [ "x${GRUB_DISABLE_OS_PROBER}" = "xtrue" ]; then | |
55 | exit 0 | |
56 | --- burg-1.98.r1844-bzr/util/grub-mkconfig.in~ 2011-04-19 11:33:43.932648744 +0200 | |
57 | +++ burg-1.98.r1844-bzr/util/grub-mkconfig.in 2011-04-19 11:47:12.666008544 +0200 | |
58 | @@ -73,7 +73,7 @@ | |
59 | esac | |
60 | done | |
61 | ||
62 | -. ${libdir}/burg/burg-mkconfig_lib | |
63 | +. /lib/burg-mkconfig_lib | |
64 | ||
65 | case "$host_os" in | |
66 | netbsd* | openbsd*) | |
67 | --- burg-1.98.r1844-bzr/util/grub-install.in~ 2011-04-19 10:42:18.000000000 +0200 | |
68 | +++ burg-1.98.r1844-bzr/util/grub-install.in 2011-04-19 11:47:58.406010031 +0200 | |
69 | @@ -160,7 +160,7 @@ | |
70 | done | |
71 | ||
72 | # for make_system_path_relative_to_its_root() | |
73 | -. ${libdir}/burg/burg-mkconfig_lib | |
74 | +. /lib/burg-mkconfig_lib | |
75 | ||
76 | if test "x$install_device" = x && test "${target_cpu}-${platform}" != "mips-yeeloong"; then | |
77 | echo "install_device not specified." 1>&2 | |
78 | --- burg-1.98.r1844-bzr/util/update-grub_lib.in~ 2011-04-19 10:42:18.000000000 +0200 | |
79 | +++ burg-1.98.r1844-bzr/util/update-grub_lib.in 2011-04-19 11:48:34.772677896 +0200 | |
80 | @@ -18,6 +18,6 @@ | |
81 | exec_prefix=@exec_prefix@ | |
82 | libdir=@libdir@ | |
83 | ||
84 | -. ${libdir}/burg/burg-mkconfig_lib | |
85 | +. /lib/burg-mkconfig_lib | |
86 | ||
87 | grub_warn "update-burg_lib is deprecated, use burg-mkconfig_lib instead" | |
88 | --- burg-1.98.r1844-bzr/Makefile.in~ 2011-04-19 10:42:18.000000000 +0200 | |
89 | +++ burg-1.98.r1844-bzr/Makefile.in 2011-04-20 12:54:45.433360015 +0200 | |
90 | @@ -343,12 +343,12 @@ | |
91 | dest="`echo $$file | sed 's,.*/,,;s,grub,burg,' | sed '$(transform)'`"; \ | |
92 | $(INSTALL_DATA) $$dir$$file $(DESTDIR)$(sysconfdir)/$(PACKAGE_TARNAME).d/$$dest; \ | |
93 | done | |
94 | - $(SHELL) $(mkinstalldirs) $(DESTDIR)$(libdir)/$(PACKAGE_TARNAME) | |
95 | + $(SHELL) $(mkinstalldirs) $(DESTDIR)/lib | |
96 | @list='$(lib_SCRIPTS)'; \ | |
97 | for file in $$list; do \ | |
98 | if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \ | |
99 | dest="`echo $$file | sed 's,.*/,,;s,grub,burg,'`"; \ | |
100 | - $(INSTALL_DATA) $$dir$$file $(DESTDIR)$(libdir)/$(PACKAGE_TARNAME)/$$dest; \ | |
101 | + $(INSTALL_DATA) $$dir$$file $(DESTDIR)/lib/$$dest; \ | |
102 | done | |
103 | @langs='$(LINGUAS)'; \ | |
104 | for lang in $$langs; do \ | |
105 | @@ -400,7 +400,7 @@ | |
106 | @list='$(lib_SCRIPTS)'; \ | |
107 | for file in $$list; do \ | |
108 | dest="`echo $$file | sed 's,.*/,,;s,grub,burg,'`"; \ | |
109 | - rm -f $(DESTDIR)$(libdir)/grub/$$dest; \ | |
110 | + rm -f $(DESTDIR)/lib/$$dest; \ | |
111 | done | |
112 | @list='$(info_INFOS)'; \ | |
113 | for file in $$list; do \ |