Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix the links between HTML manuals.

+ Use /usr/share/doc/gcc-X.Y-doc for all packages except gcc-doc-base,
  since we can't use @xref between directories.
+ Stop linking to (e.g.) gcc-4.6.html; the file is named gcc.html!
+ Update the *.doc-base* files for the new paths.

Unfortunately, many cross-references involving the GNAT *info* files
have been broken for a while (probably at least since the docs got
kicked out of gcc-X.Y proper for being non-free).  (This is arguably a
bug in the rename-info-files.patch from the gcc-X.Y packages.)
  • Loading branch information...
commit 8b6a0250540c04d4911c18ecddda412bd8652a16 1 parent bdc4dec
@SamB authored
View
25 debian/Makefile
@@ -35,6 +35,19 @@ MKINFO_DEFINES := -D "fncpp cpp-$(VER)" \
MKINFO_FLAGS := --no-split -Igcc/doc -Igcc/doc/include
MKINFO = makeinfo $(MKINFO_DEFINES) $(MKINFO_FLAGS)
+MKHTML_DEFINES := -D "fncpp cpp" \
+ -D "fncppint cppinternals" \
+ -D "fngcc gcc" \
+ -D "fngxx g++" \
+ -D "fngccint gccint" \
+ -D "fngccinstall gccinstall" \
+ -D "fngcj gcj" \
+ -D "fngfortran gfortran" \
+ -D "fntreelang treelang" \
+ -D "BUGURL http://bugs.debian.org/"
+MKHTML_FLAGS := --no-split -Igcc/doc -Igcc/doc/include
+MKHTML = makeinfo $(MKHTML_DEFINES) $(MKHTML_FLAGS) --html
+
TEXI2POD_DEFINES := -Dfngccint=gccint-$(VER) -DBUGURL=http://bugs.debian.org/
TEXI2POD = perl ../../contrib/texi2pod.pl $(TEXI2POD_DEFINES)
@@ -50,7 +63,7 @@ $(I_GCC:%=%-$(VER).info) : %-$(VER).info : gcc/doc/%.texi $(GCCVERS)
$(MKINFO) -o $@ $<
$(I_GCC:%=%.html) : %.html : gcc/doc/%.texi $(GCCVERS)
- $(MKINFO) --html -o $@ $<
+ $(MKHTML) -o $@ $<
gccinstall-$(VER).info : gcc/doc/install.texi $(GCCVERS)
$(MKINFO) -o $@ $<
@@ -59,19 +72,19 @@ $(I_FORTRAN:%=%-$(VER).info) : %-$(VER).info : gcc/fortran/%.texi $(GCCVERS)
$(MKINFO) -o $@ $<
$(I_FORTRAN:%=%.html) : %.html : gcc/fortran/%.texi $(GCCVERS)
- $(MKINFO) --html -o $@ $<
+ $(MKHTML) -o $@ $<
$(I_GCJ:%=%-$(VER).info) : %-$(VER).info : gcc/java/%.texi $(GCCVERS)
$(MKINFO) -o $@ $<
$(I_GCJ:%=%.html) : %.html : gcc/java/%.texi $(GCCVERS)
- $(MKINFO) --html -o $@ $<
+ $(MKHTML) -o $@ $<
$(I_GO:%=%-$(VER).info) : %-$(VER).info : gcc/go/%.texi $(GCCVERS)
$(MKINFO) -o $@ $<
$(I_GO:%=%.html) : %.html : gcc/go/%.texi $(GCCVERS)
- $(MKINFO) --html -o $@ $<
+ $(MKHTML) -o $@ $<
#
@@ -91,13 +104,13 @@ gnat_ugn-$(VER).info : gcc/doc/gnat_ugn.texi $(GCCVERS)
$(MKINFO) -o $@ $<
gnat_ugn.html : gcc/doc/gnat_ugn.texi $(GCCVERS)
- $(MKINFO) --html -o $@ $<
+ $(MKHTML) -o $@ $<
$(I_ADA:%=%-$(VER).info) : %-$(VER).info : gcc/ada/%.texi $(GCCVERS)
$(MKINFO) -o $@ $<
$(I_ADA:%=%.html) : %.html : gcc/ada/%.texi $(GCCVERS)
- $(MKINFO) --html -o $@ $<
+ $(MKHTML) -o $@ $<
#
View
14 debian/changelog
@@ -1,3 +1,17 @@
+gcc-4.6-doc (4.6.3-1~naesten7) UNRELEASED; urgency=low
+
+ * Fix the links between HTML manuals.
+ + Use /usr/share/doc/gcc-X.Y-doc for all packages except gcc-doc-base,
+ since we can't use @xref between directories.
+ + Stop linking to (e.g.) gcc-4.6.html; the file is named gcc.html!
+ + Update the *.doc-base* files for the new paths.
+ * Unfortunately, many cross-references involving the GNAT *info* files
+ have been broken for a while (probably at least since the docs got
+ kicked out of gcc-X.Y proper for being non-free). (This is arguably a
+ bug in the rename-info-files.patch from the gcc-X.Y packages.)
+
+ -- Samuel Bronson <naesten@gmail.com> Fri, 30 Mar 2012 14:46:49 -0400
+
gcc-4.6-doc (4.6.3-1~naesten6) unstable; urgency=low
* New upstream release.
View
4 debian/cpp-BV-doc.doc-base.cpp
@@ -8,8 +8,8 @@ Abstract: The C preprocessor is a "macro processor" that is used automatically
Section: Programming
Format: html
-Index: /usr/share/doc/cpp-@BV@-doc/cpp.html
-Files: /usr/share/doc/cpp-@BV@-doc/cpp.html
+Index: /usr/share/doc/gcc-@BV@-doc/cpp.html
+Files: /usr/share/doc/gcc-@BV@-doc/cpp.html
Format: info
Index: /usr/share/info/cpp-@BV@.info.gz
View
4 debian/cpp-BV-doc.doc-base.cppint
@@ -9,8 +9,8 @@ Abstract: This brief manual documents the internals of cpplib, and
Section: Programming
Format: html
-Index: /usr/share/doc/cpp-@BV@-doc/cppinternals.html
-Files: /usr/share/doc/cpp-@BV@-doc/cppinternals.html
+Index: /usr/share/doc/gcc-@BV@-doc/cppinternals.html
+Files: /usr/share/doc/gcc-@BV@-doc/cppinternals.html
Format: info
Index: /usr/share/info/cppinternals-@BV@.info.gz
View
4 debian/gccgo-BV-doc.doc-base
@@ -5,8 +5,8 @@ Abstract: This manual documents how to use the GNU go compiler.
Section: Programming
Format: html
-Index: /usr/share/doc/gccgo-@BV@-doc/gccgo.html
-Files: /usr/share/doc/gccgo-@BV@-doc/gccgo.html
+Index: /usr/share/doc/gcc-@BV@-doc/gccgo.html
+Files: /usr/share/doc/gcc-@BV@-doc/gccgo.html
Format: info
Index: /usr/share/info/gccgo-@BV@.info.gz
View
4 debian/gcj-BV-doc.doc-base
@@ -7,8 +7,8 @@ Abstract: This manual describes how to use gcj, the GNU compiler for the Java
Section: Programming
Format: html
-Index: /usr/share/doc/gcj-@BV@-doc/gcj.html
-Files: /usr/share/doc/gcj-@BV@-doc/gcj.html
+Index: /usr/share/doc/gcc-@BV@-doc/gcj.html
+Files: /usr/share/doc/gcc-@BV@-doc/gcj.html
Format: info
Index: /usr/share/info/gcj-@BV@.info.gz
View
4 debian/gfortran-BV-doc.doc-base
@@ -6,8 +6,8 @@ Abstract: This manual documents how to run, install and port `gfortran',
Section: Programming
Format: html
-Index: /usr/share/doc/gfortran-@BV@-doc/gfortran.html
-Files: /usr/share/doc/gfortran-@BV@-doc/gfortran.html
+Index: /usr/share/doc/gcc-@BV@-doc/gfortran.html
+Files: /usr/share/doc/gcc-@BV@-doc/gfortran.html
Format: info
Index: /usr/share/info/gfortran-@BV@.info.gz
View
4 debian/gnat-BV-doc.doc-base.rm
@@ -8,8 +8,8 @@ Abstract: This manual contains useful information in writing programs using
Section: Programming
Format: html
-Index: /usr/share/doc/gnat-@BV@-doc/gnat_rm.html
-Files: /usr/share/doc/gnat-@BV@-doc/gnat_rm.html
+Index: /usr/share/doc/gcc-@BV@-doc/gnat_rm.html
+Files: /usr/share/doc/gcc-@BV@-doc/gnat_rm.html
Format: info
Index: /usr/share/info/gnat_rm-@BV@.info.gz
View
4 debian/gnat-BV-doc.doc-base.style
@@ -7,8 +7,8 @@ Abstract: Most of GNAT is written in Ada using a consistent style
Section: Programming
Format: html
-Index: /usr/share/doc/gnat-@BV@-doc/gnat-style.html
-Files: /usr/share/doc/gnat-@BV@-doc/gnat-style.html
+Index: /usr/share/doc/gcc-@BV@-doc/gnat-style.html
+Files: /usr/share/doc/gcc-@BV@-doc/gnat-style.html
Format: info
Index: /usr/share/info/gnat-style-@BV@.info.gz
View
4 debian/gnat-BV-doc.doc-base.ugn
@@ -8,8 +8,8 @@ Abstract: This guide describes the use of GNAT, a compiler and
Section: Programming
Format: html
-Index: /usr/share/doc/gnat-@BV@-doc/gnat_ugn.html
-Files: /usr/share/doc/gnat-@BV@-doc/gnat_ugn.html
+Index: /usr/share/doc/gcc-@BV@-doc/gnat_ugn.html
+Files: /usr/share/doc/gcc-@BV@-doc/gnat_ugn.html
Format: info
Index: /usr/share/info/gnat_ugn-@BV@.info.gz
View
6 debian/rules
@@ -52,7 +52,7 @@ clean-versioned-files:
%:
dh $@
-override_dh_auto_build-indep:
+override_dh_auto_build:
$(MAKE) -f debian/Makefile
override_dh_auto_clean: clean-versioned-files
@@ -60,6 +60,10 @@ override_dh_auto_clean: clean-versioned-files
override_dh_auto_install: versioned-files
+override_dh_installdocs:
+ dh_installdocs -pgcc-doc-base
+ dh_installdocs --remaining-packages --link-doc=gcc-$(BASE_VERSION)-doc
+
# XXX: Policy says this rule should download the latest, but there
# doesn't seem to be a good way to know what version uscan downloaded,
# so we don't do that yet.
Please sign in to comment.
Something went wrong with that request. Please try again.