]>
Commit | Line | Data |
---|---|---|
82705b6e MT |
1 | --- grub-0.97/stage1/Makefile.am.datadir 2005-12-14 11:07:01.000000000 -0500 |
2 | +++ grub-0.97/stage1/Makefile.am 2005-12-14 11:07:21.000000000 -0500 | |
3 | @@ -1,7 +1,7 @@ | |
4 | -pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor) | |
5 | -nodist_pkglib_DATA = stage1 | |
6 | +pkgdatadir = $(datadir)/$(PACKAGE)/$(host_cpu)-$(host_vendor) | |
7 | +nodist_pkgdata_DATA = stage1 | |
8 | ||
9 | -CLEANFILES = $(nodist_pkglib_DATA) | |
10 | +CLEANFILES = $(nodist_pkgdata_DATA) | |
11 | ||
12 | # We can't use builtins or standard includes. | |
13 | AM_CCASFLAGS = $(STAGE1_CFLAGS) -fno-builtin -nostdinc | |
14 | --- grub-0.97/stage1/Makefile.in.datadir 2005-05-07 22:42:36.000000000 -0400 | |
15 | +++ grub-0.97/stage1/Makefile.in 2005-12-14 11:08:13.000000000 -0500 | |
16 | @@ -1,8 +1,8 @@ | |
17 | -# Makefile.in generated by automake 1.9.4 from Makefile.am. | |
18 | +# Makefile.in generated by automake 1.9.6 from Makefile.am. | |
19 | # @configure_input@ | |
20 | ||
21 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | |
22 | -# 2003, 2004 Free Software Foundation, Inc. | |
23 | +# 2003, 2004, 2005 Free Software Foundation, Inc. | |
24 | # This Makefile.in is free software; the Free Software Foundation | |
25 | # gives unlimited permission to copy and/or distribute it, | |
26 | # with or without modifications, as long as this notice is preserved. | |
27 | @@ -15,8 +15,6 @@ | |
28 | @SET_MAKE@ | |
29 | ||
30 | ||
31 | -SOURCES = $(stage1_exec_SOURCES) | |
32 | - | |
33 | srcdir = @srcdir@ | |
34 | top_srcdir = @top_srcdir@ | |
35 | VPATH = @srcdir@ | |
36 | @@ -67,13 +65,13 @@ | |
37 | *) f=$$p;; \ | |
38 | esac; | |
39 | am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; | |
40 | -am__installdirs = "$(DESTDIR)$(pkglibdir)" | |
41 | -nodist_pkglibDATA_INSTALL = $(INSTALL_DATA) | |
42 | -DATA = $(nodist_pkglib_DATA) | |
43 | +am__installdirs = "$(DESTDIR)$(pkgdatadir)" | |
44 | +nodist_pkgdataDATA_INSTALL = $(INSTALL_DATA) | |
45 | +DATA = $(nodist_pkgdata_DATA) | |
46 | ETAGS = etags | |
47 | CTAGS = ctags | |
48 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) | |
49 | -pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor) | |
50 | +pkgdatadir = $(datadir)/$(PACKAGE)/$(host_cpu)-$(host_vendor) | |
51 | ACLOCAL = @ACLOCAL@ | |
52 | AMDEP_FALSE = @AMDEP_FALSE@ | |
53 | AMDEP_TRUE = @AMDEP_TRUE@ | |
54 | @@ -102,6 +100,8 @@ | |
55 | EGREP = @EGREP@ | |
56 | EXEEXT = @EXEEXT@ | |
57 | FSYS_CFLAGS = @FSYS_CFLAGS@ | |
58 | +GRAPHICS_SUPPORT_FALSE = @GRAPHICS_SUPPORT_FALSE@ | |
59 | +GRAPHICS_SUPPORT_TRUE = @GRAPHICS_SUPPORT_TRUE@ | |
60 | GRUB_CFLAGS = @GRUB_CFLAGS@ | |
61 | GRUB_LIBS = @GRUB_LIBS@ | |
62 | HERCULES_SUPPORT_FALSE = @HERCULES_SUPPORT_FALSE@ | |
63 | @@ -172,6 +172,7 @@ | |
64 | infodir = @infodir@ | |
65 | install_sh = @install_sh@ | |
66 | libdir = @libdir@ | |
67 | +datadir = @datadir@ | |
68 | libexecdir = @libexecdir@ | |
69 | localstatedir = @localstatedir@ | |
70 | mandir = @mandir@ | |
71 | @@ -183,8 +184,8 @@ | |
72 | sharedstatedir = @sharedstatedir@ | |
73 | sysconfdir = @sysconfdir@ | |
74 | target_alias = @target_alias@ | |
75 | -nodist_pkglib_DATA = stage1 | |
76 | -CLEANFILES = $(nodist_pkglib_DATA) | |
77 | +nodist_pkgdata_DATA = stage1 | |
78 | +CLEANFILES = $(nodist_pkgdata_DATA) | |
79 | ||
80 | # We can't use builtins or standard includes. | |
81 | AM_CCASFLAGS = $(STAGE1_CFLAGS) -fno-builtin -nostdinc | |
82 | @@ -242,22 +243,22 @@ | |
83 | .S.obj: | |
84 | $(CCASCOMPILE) -c `$(CYGPATH_W) '$<'` | |
85 | uninstall-info-am: | |
86 | -install-nodist_pkglibDATA: $(nodist_pkglib_DATA) | |
87 | +install-nodist_pkgdataDATA: $(nodist_pkgdata_DATA) | |
88 | @$(NORMAL_INSTALL) | |
89 | - test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)" | |
90 | - @list='$(nodist_pkglib_DATA)'; for p in $$list; do \ | |
91 | + test -z "$(pkgdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)" | |
92 | + @list='$(nodist_pkgdata_DATA)'; for p in $$list; do \ | |
93 | if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ | |
94 | f=$(am__strip_dir) \ | |
95 | - echo " $(nodist_pkglibDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \ | |
96 | - $(nodist_pkglibDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \ | |
97 | + echo " $(nodist_pkgdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgdatadir)/$$f'"; \ | |
98 | + $(nodist_pkgdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \ | |
99 | done | |
100 | ||
101 | -uninstall-nodist_pkglibDATA: | |
102 | +uninstall-nodist_pkgdataDATA: | |
103 | @$(NORMAL_UNINSTALL) | |
104 | - @list='$(nodist_pkglib_DATA)'; for p in $$list; do \ | |
105 | + @list='$(nodist_pkgdata_DATA)'; for p in $$list; do \ | |
106 | f=$(am__strip_dir) \ | |
107 | - echo " rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \ | |
108 | - rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \ | |
109 | + echo " rm -f '$(DESTDIR)$(pkgdatadir)/$$f'"; \ | |
110 | + rm -f "$(DESTDIR)$(pkgdatadir)/$$f"; \ | |
111 | done | |
112 | ||
113 | ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) | |
114 | @@ -339,7 +340,7 @@ | |
115 | check: check-am | |
116 | all-am: Makefile $(PROGRAMS) $(DATA) | |
117 | installdirs: | |
118 | - for dir in "$(DESTDIR)$(pkglibdir)"; do \ | |
119 | + for dir in "$(DESTDIR)$(pkgdatadir)"; do \ | |
120 | test -z "$$dir" || $(mkdir_p) "$$dir"; \ | |
121 | done | |
122 | install: install-am | |
123 | @@ -388,7 +389,7 @@ | |
124 | ||
125 | install-data-am: | |
126 | ||
127 | -install-exec-am: install-nodist_pkglibDATA | |
128 | +install-exec-am: install-nodist_pkgdataDATA | |
129 | ||
130 | install-info: install-info-am | |
131 | ||
132 | @@ -412,19 +413,19 @@ | |
133 | ||
134 | ps-am: | |
135 | ||
136 | -uninstall-am: uninstall-info-am uninstall-nodist_pkglibDATA | |
137 | +uninstall-am: uninstall-info-am uninstall-nodist_pkgdataDATA | |
138 | ||
139 | .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ | |
140 | clean-noinstPROGRAMS ctags distclean distclean-compile \ | |
141 | distclean-generic distclean-tags distdir dvi dvi-am html \ | |
142 | html-am info info-am install install-am install-data \ | |
143 | install-data-am install-exec install-exec-am install-info \ | |
144 | - install-info-am install-man install-nodist_pkglibDATA \ | |
145 | + install-info-am install-man install-nodist_pkgdataDATA \ | |
146 | install-strip installcheck installcheck-am installdirs \ | |
147 | maintainer-clean maintainer-clean-generic mostlyclean \ | |
148 | mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ | |
149 | tags uninstall uninstall-am uninstall-info-am \ | |
150 | - uninstall-nodist_pkglibDATA | |
151 | + uninstall-nodist_pkgdataDATA | |
152 | ||
153 | .exec: | |
154 | $(OBJCOPY) -O binary $< $@ | |
155 | --- grub-0.97/util/grub-install.in.datadir 2005-12-14 11:00:21.000000000 -0500 | |
156 | +++ grub-0.97/util/grub-install.in 2005-12-14 11:00:21.000000000 -0500 | |
157 | @@ -21,13 +21,13 @@ | |
158 | prefix=@prefix@ | |
159 | exec_prefix=@exec_prefix@ | |
160 | sbindir=@sbindir@ | |
161 | -libdir=@libdir@ | |
162 | +datadir=@datadir@ | |
163 | PACKAGE=@PACKAGE@ | |
164 | VERSION=@VERSION@ | |
165 | host_cpu=@host_cpu@ | |
166 | host_os=@host_os@ | |
167 | host_vendor=@host_vendor@ | |
168 | -pkglibdir=${libdir}/${PACKAGE}/${host_cpu}-${host_vendor} | |
169 | +pkgdatadir=${datadir}/${PACKAGE}/${host_cpu}-${host_vendor} | |
170 | ||
171 | grub_shell=${sbindir}/grub | |
172 | mdadm=${sbindir}/mdadm | |
173 | @@ -388,17 +388,17 @@ | |
174 | exit 1 | |
175 | fi | |
176 | ||
177 | -if test -f "$pkglibdir/stage1"; then | |
178 | +if test -f "$pkgdatadir/stage1"; then | |
179 | : | |
180 | else | |
181 | - echo "${pkglibdir}/stage1: Not found." 1>&2 | |
182 | + echo "${pkgdatadir}/stage1: Not found." 1>&2 | |
183 | exit 1 | |
184 | fi | |
185 | ||
186 | -if test -f "$pkglibdir/stage2"; then | |
187 | +if test -f "$pkgdatadir/stage2"; then | |
188 | : | |
189 | else | |
190 | - echo "${pkglibdir}/stage2: Not found." 1>&2 | |
191 | + echo "${pkgdatadir}/stage2: Not found." 1>&2 | |
192 | exit 1 | |
193 | fi | |
194 | ||
195 | --- grub-0.97/stage2/Makefile.am.datadir 2005-12-14 11:03:54.000000000 -0500 | |
196 | +++ grub-0.97/stage2/Makefile.am 2005-12-14 11:05:04.000000000 -0500 | |
197 | @@ -27,12 +27,12 @@ | |
198 | -DUSE_MD5_PASSWORDS=1 -DSUPPORT_SERIAL=1 -DSUPPORT_HERCULES=1 | |
199 | ||
200 | # Stage 2 and Stage 1.5's. | |
201 | -pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor) | |
202 | +pkgdatadir = $(datadir)/$(PACKAGE)/$(host_cpu)-$(host_vendor) | |
203 | ||
204 | EXTRA_PROGRAMS = nbloader.exec pxeloader.exec diskless.exec | |
205 | ||
206 | if DISKLESS_SUPPORT | |
207 | -pkglib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \ | |
208 | +pkgdata_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \ | |
209 | ffs_stage1_5 iso9660_stage1_5 jfs_stage1_5 minix_stage1_5 \ | |
210 | reiserfs_stage1_5 ufs2_stage1_5 vstafs_stage1_5 xfs_stage1_5 \ | |
211 | nbgrub pxegrub | |
212 | @@ -43,7 +43,7 @@ | |
213 | reiserfs_stage1_5.exec ufs2_stage1_5.exec vstafs_stage1_5.exec \ | |
214 | xfs_stage1_5.exec nbloader.exec pxeloader.exec diskless.exec | |
215 | else | |
216 | -pkglib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \ | |
217 | +pkgdata_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \ | |
218 | ffs_stage1_5 iso9660_stage1_5 jfs_stage1_5 minix_stage1_5 \ | |
219 | reiserfs_stage1_5 ufs2_stage1_5 vstafs_stage1_5 xfs_stage1_5 | |
220 | noinst_DATA = pre_stage2 start start_eltorito | |
221 | @@ -112,7 +112,7 @@ | |
222 | BUILT_SOURCES = stage2_size.h | |
223 | endif | |
224 | ||
225 | -CLEANFILES = $(pkglib_DATA) $(noinst_DATA) $(BUILT_SOURCES) | |
226 | +CLEANFILES = $(pkgdata_DATA) $(noinst_DATA) $(BUILT_SOURCES) | |
227 | ||
228 | stage2_size.h: pre_stage2 | |
229 | -rm -f stage2_size.h |