Skip to content

Commit 8a6ea7a

Browse files
crassDaniel Kiper
authored andcommitted
bootstrap: Run linguas.sh in bootstrap epilogue
Heretofore, linguas.sh had to be run by the user and a common mistake made when building GRUB was to not run the command. By adding it to the bootstrap epilogue it will by default get run at the end of the bootstrap script. The user no longer needs to remember to run it. If the --skip-po option is passed to bootstrap, do not run linguas.sh. This allows for bootstrap to be run without updating the translations, which might be desired in the future if we track po files so that translations can be used as they were at time of release. Update INSTALL file to reflect that it is no longer necessary to run linguas.sh. Also, fix a list numbering error. Fixes: 9f73ebd (* INSTALL: Document linguas.sh.) Signed-off-by: Glenn Washburn <development@efficientek.com> Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 parent cb811bd commit 8a6ea7a

File tree

2 files changed

+14
-11
lines changed

2 files changed

+14
-11
lines changed

INSTALL

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -142,35 +142,32 @@ The simplest way to compile this package is:
142142

143143
1. `cd' to the directory containing the package's source code.
144144

145-
2. Skip this and following step if you use release tarball and proceed to
146-
step 4. If you want translations type `./linguas.sh'.
147-
148-
3. Type `./bootstrap'.
145+
2. Type `./bootstrap'.
149146

150147
The autogen.sh (called by bootstrap) uses python. By default autodetect
151148
it, but it can be overridden by setting the PYTHON variable.
152149

153-
4. Type `./configure' to configure the package for your system.
150+
3. Type `./configure' to configure the package for your system.
154151
If you're using `csh' on an old version of System V, you might
155152
need to type `sh ./configure' instead to prevent `csh' from trying
156153
to execute `configure' itself.
157154

158155
Running `configure' takes awhile. While running, it prints some
159156
messages telling which features it is checking for.
160157

161-
6. Type `make' to compile the package.
158+
4. Type `make' to compile the package.
162159

163-
7. Optionally, type `make check' to run any self-tests that come with
160+
5. Optionally, type `make check' to run any self-tests that come with
164161
the package. Note that many of the tests require root privileges in
165162
order to run.
166163

167-
8. Type `make install' to install the programs and any data files and
164+
6. Type `make install' to install the programs and any data files and
168165
documentation.
169166

170-
9. Type `make html' or `make pdf' to generate the html or pdf
167+
7. Type `make html' or `make pdf' to generate the html or pdf
171168
documentation. Note, these are not built by default.
172169

173-
10. You can remove the program binaries and object files from the
170+
8. You can remove the program binaries and object files from the
174171
source code directory by typing `make clean'. To also remove the
175172
files that `configure' created (so you can compile the package for
176173
a different kind of computer), type `make distclean'. There is

bootstrap.conf

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ checkout_only_file=
6363
copy=true
6464
vc_ignore=
6565

66-
SKIP_PO=t
66+
SKIP_PO=n
6767

6868
# Build prerequisites
6969
buildreq="\
@@ -108,4 +108,10 @@ bootstrap_post_import_hook () {
108108

109109
bootstrap_epilogue () {
110110
mv INSTALL.grub INSTALL
111+
112+
# Update translation files and create LINGUAS file used to determine
113+
# the set of languages used to translate.
114+
if [ "x$SKIP_PO" = "xn" ]; then
115+
./linguas.sh
116+
fi
111117
}

0 commit comments

Comments
 (0)