os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Use &url.main; entity in place of ../../../..

Browse source 
Replace &url.main; -> http://www.FreeBSD.org
when URLS_ABSOLUTE is set (for release building),
and -> ../../../.. by default (for mirror sites).

Patch was slightly modified by:	hrs
Discussed with:	des, ceri, hrs, trhodes, simon
This commit is contained in:
Denis Peplin 2004-05-05 12:52:48 +00:00
parent 2e9f076668
commit 2b0f6c0e65
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=20852
4 changed files with 22 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
en_US.ISO8859-1/books/handbook/Makefile
View file

@ -225,6 +225,8 @@ SRCS+= eresources.sgml.www.inc
CLEANFILES+= eresources.sgml.www.inc CLEANFILES+= eresources.sgml.www.inc
CLEANFILES+= eresources.sgml.www.inc.tmp CLEANFILES+= eresources.sgml.www.inc.tmp
SRCS+= ${URLS_ENT}
.include "${DOC_PREFIX}/share/mk/doc.project.mk" .include "${DOC_PREFIX}/share/mk/doc.project.mk"
.for p in ftp cvsup .for p in ftp cvsup

4
en_US.ISO8859-1/books/handbook/book.sgml
View file

@ -24,6 +24,8 @@
<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"> <!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
%trademarks; %trademarks;
<!ENTITY % txtfiles SYSTEM "txtfiles.ent"> %txtfiles; <!ENTITY % txtfiles SYSTEM "txtfiles.ent"> %txtfiles;
<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
%urls;
<!ENTITY % not.published "INCLUDE"> <!ENTITY % not.published "INCLUDE">
@ -144,7 +146,7 @@
<ulink <ulink
url="http://www.freebsdmall.com/">FreeBSD Mall</ulink>. You url="http://www.freebsdmall.com/">FreeBSD Mall</ulink>. You
may also want to <ulink may also want to <ulink
url="../../../../search/index.html">search the url="&url.main;/search/index.html">search the
handbook</ulink>.</para> handbook</ulink>.</para>
</abstract> </abstract>
</bookinfo> </bookinfo>

15
share/mk/doc.common.mk
View file

@ -158,3 +158,18 @@ ${XML_MIRRORS}: ${XML_MIRRORS_MASTER} ${XSL_TRANSTABLE} ${XSL_TRANSTABLE_MASTER}
CLEANFILES+= ${XML_MIRRORS} CLEANFILES+= ${XML_MIRRORS}
CLEANFILES+= ${XML_MIRRORS}.sort CLEANFILES+= ${XML_MIRRORS}.sort
CLEANFILES+= ${XML_MIRRORS}.sort.tmp CLEANFILES+= ${XML_MIRRORS}.sort.tmp
#
# urls.ent dependency.
#
URLS_ENT= ${.OBJDIR}/${DOC_PREFIX:S,^${.CURDIR}/,,}/share/sgml/urls.ent
${URLS_ENT}:
.if !defined(URLS_ABSOLUTE)
echo '<!ENTITY url.main "../../../..">' > $@
.else
echo '<!ENTITY url.main "http://www.FreeBSD.org">' > $@
.endif
CLEANFILES+= ${URLS_ENT}

2
share/sgml/catalog
View file

@ -38,6 +38,8 @@ PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN"
PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN" PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
"trademarks.ent" "trademarks.ent"
PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
"urls.ent"
-- ...................................................................... -- -- ...................................................................... --
-- English specific ..................................................... -- -- English specific ..................................................... --