248261f8d1
update to 2.00 final OBS-URL: https://build.opensuse.org/request/show/126465 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grub2?expand=0&rev=37
137 lines
5.0 KiB
Diff
137 lines
5.0 KiB
Diff
From 031abf80020b2fa75850d6e09f4489b687a5cb19 Mon Sep 17 00:00:00 2001
|
|
From: Jiri Slaby <jirislaby@gmail.com>
|
|
Date: Sun, 24 Jun 2012 15:40:40 +0200
|
|
Subject: [PATCH] rename grub info file to grub2
|
|
|
|
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
|
|
---
|
|
docs/Makefile.am | 2 +-
|
|
docs/Makefile.in | 46 ++++++++++++++++++++--------------------
|
|
docs/{grub.texi => grub2.texi} | 2 +-
|
|
3 files changed, 25 insertions(+), 25 deletions(-)
|
|
rename docs/{grub.texi => grub2.texi} (99%)
|
|
|
|
diff --git a/docs/Makefile.am b/docs/Makefile.am
|
|
index 93eb396..4143042 100644
|
|
--- a/docs/Makefile.am
|
|
+++ b/docs/Makefile.am
|
|
@@ -1,7 +1,7 @@
|
|
AUTOMAKE_OPTIONS = subdir-objects
|
|
|
|
# AM_MAKEINFOFLAGS = --no-split --no-validate
|
|
-info_TEXINFOS = grub.texi grub-dev.texi
|
|
+info_TEXINFOS = grub2.texi grub-dev.texi
|
|
grub_TEXINFOS = fdl.texi
|
|
|
|
EXTRA_DIST = font_char_metrics.png font_char_metrics.txt
|
|
diff --git a/docs/Makefile.in b/docs/Makefile.in
|
|
index 217ea7e..49dc477 100644
|
|
--- a/docs/Makefile.in
|
|
+++ b/docs/Makefile.in
|
|
@@ -35,8 +35,8 @@ build_triplet = @build@
|
|
host_triplet = @host@
|
|
target_triplet = @target@
|
|
subdir = docs
|
|
-DIST_COMMON = $(grub_TEXINFOS) $(srcdir)/Makefile.am \
|
|
- $(srcdir)/Makefile.in $(srcdir)/stamp-1 $(srcdir)/stamp-vti \
|
|
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
|
|
+ $(srcdir)/stamp-1 $(srcdir)/stamp-vti \
|
|
$(srcdir)/version-dev.texi $(srcdir)/version.texi mdate-sh \
|
|
texinfo.tex
|
|
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
|
@@ -91,14 +91,14 @@ CONFIG_CLEAN_FILES =
|
|
CONFIG_CLEAN_VPATH_FILES =
|
|
SOURCES =
|
|
DIST_SOURCES =
|
|
-INFO_DEPS = $(srcdir)/grub.info $(srcdir)/grub-dev.info
|
|
+INFO_DEPS = $(srcdir)/grub2.info $(srcdir)/grub-dev.info
|
|
TEXINFO_TEX = $(top_srcdir)/build-aux/texinfo.tex
|
|
am__TEXINFO_TEX_DIR = $(top_srcdir)/build-aux
|
|
-DVIS = grub.dvi grub-dev.dvi
|
|
-PDFS = grub.pdf grub-dev.pdf
|
|
-PSS = grub.ps grub-dev.ps
|
|
-HTMLS = grub.html grub-dev.html
|
|
-TEXINFOS = grub.texi grub-dev.texi
|
|
+DVIS = grub2.dvi grub-dev.dvi
|
|
+PDFS = grub2.pdf grub-dev.pdf
|
|
+PSS = grub2.ps grub-dev.ps
|
|
+HTMLS = grub2.html grub-dev.html
|
|
+TEXINFOS = grub2.texi grub-dev.texi
|
|
TEXI2DVI = texi2dvi
|
|
TEXI2PDF = $(TEXI2DVI) --pdf --batch
|
|
MAKEINFOHTML = $(MAKEINFO) --html
|
|
@@ -767,7 +767,7 @@ top_srcdir = @top_srcdir@
|
|
AUTOMAKE_OPTIONS = subdir-objects
|
|
|
|
# AM_MAKEINFOFLAGS = --no-split --no-validate
|
|
-info_TEXINFOS = grub.texi grub-dev.texi
|
|
+info_TEXINFOS = grub2.texi grub-dev.texi
|
|
grub_TEXINFOS = fdl.texi
|
|
EXTRA_DIST = font_char_metrics.png font_char_metrics.txt
|
|
all: all-am
|
|
@@ -850,14 +850,14 @@ $(am__aclocal_m4_deps):
|
|
rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \
|
|
exit 1; \
|
|
fi
|
|
-$(srcdir)/grub.info: grub.texi $(srcdir)/version.texi $(grub_TEXINFOS)
|
|
-grub.dvi: grub.texi $(srcdir)/version.texi $(grub_TEXINFOS)
|
|
-grub.pdf: grub.texi $(srcdir)/version.texi $(grub_TEXINFOS)
|
|
-grub.html: grub.texi $(srcdir)/version.texi $(grub_TEXINFOS)
|
|
+$(srcdir)/grub2.info: grub2.texi $(srcdir)/version.texi
|
|
+grub2.dvi: grub2.texi $(srcdir)/version.texi
|
|
+grub2.pdf: grub2.texi $(srcdir)/version.texi
|
|
+grub2.html: grub2.texi $(srcdir)/version.texi
|
|
$(srcdir)/version.texi: $(srcdir)/stamp-vti
|
|
-$(srcdir)/stamp-vti: grub.texi $(top_srcdir)/configure
|
|
- @(dir=.; test -f ./grub.texi || dir=$(srcdir); \
|
|
- set `$(SHELL) $(top_srcdir)/build-aux/mdate-sh $$dir/grub.texi`; \
|
|
+$(srcdir)/stamp-vti: grub2.texi $(top_srcdir)/configure
|
|
+ @(dir=.; test -f ./grub2.texi || dir=$(srcdir); \
|
|
+ set `$(SHELL) $(top_srcdir)/build-aux/mdate-sh $$dir/grub2.texi`; \
|
|
echo "@set UPDATED $$1 $$2 $$3"; \
|
|
echo "@set UPDATED-MONTH $$2 $$3"; \
|
|
echo "@set EDITION $(VERSION)"; \
|
|
@@ -979,16 +979,16 @@ dist-info: $(INFO_DEPS)
|
|
done
|
|
|
|
mostlyclean-aminfo:
|
|
- -rm -rf grub.aux grub.cp grub.cps grub.fn grub.ky grub.log grub.pg grub.tmp \
|
|
- grub.toc grub.tp grub.vr grub-dev.aux grub-dev.cp \
|
|
- grub-dev.cps grub-dev.fn grub-dev.ky grub-dev.log \
|
|
- grub-dev.pg grub-dev.tmp grub-dev.toc grub-dev.tp \
|
|
- grub-dev.vr
|
|
+ -rm -rf grub2.aux grub2.cp grub2.cps grub2.fn grub2.ky grub2.log grub2.pg \
|
|
+ grub2.tmp grub2.toc grub2.tp grub2.vr grub-dev.aux \
|
|
+ grub-dev.cp grub-dev.cps grub-dev.fn grub-dev.ky \
|
|
+ grub-dev.log grub-dev.pg grub-dev.tmp grub-dev.toc \
|
|
+ grub-dev.tp grub-dev.vr
|
|
|
|
clean-aminfo:
|
|
- -test -z "grub.dvi grub.pdf grub.ps grub.html grub-dev.dvi grub-dev.pdf \
|
|
+ -test -z "grub2.dvi grub2.pdf grub2.ps grub2.html grub-dev.dvi grub-dev.pdf \
|
|
grub-dev.ps grub-dev.html" \
|
|
- || rm -rf grub.dvi grub.pdf grub.ps grub.html grub-dev.dvi grub-dev.pdf \
|
|
+ || rm -rf grub2.dvi grub2.pdf grub2.ps grub2.html grub-dev.dvi grub-dev.pdf \
|
|
grub-dev.ps grub-dev.html
|
|
|
|
maintainer-clean-aminfo:
|
|
diff --git a/docs/grub.texi b/docs/grub2.texi
|
|
similarity index 99%
|
|
rename from docs/grub.texi
|
|
rename to docs/grub2.texi
|
|
index 26944ac..fb7fb0e 100644
|
|
--- a/docs/grub.texi
|
|
+++ b/docs/grub2.texi
|
|
@@ -1,7 +1,7 @@
|
|
\input texinfo
|
|
@c -*-texinfo-*-
|
|
@c %**start of header
|
|
-@setfilename grub.info
|
|
+@setfilename grub2.info
|
|
@include version.texi
|
|
@settitle GNU GRUB Manual @value{VERSION}
|
|
@c Unify all our little indices for now.
|
|
--
|
|
1.7.10.4
|
|
|