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

Unbreak the build. The current URLS_ENT cannot support .OBJDIR

Browse source 
when .CURDIR is not under DOC_PREFIX.  This is a band-aid measure
but I will fix this soon.

Pointy hat to:	hrs
This commit is contained in:
Hiroki Sato 2004-05-11 10:35:19 +00:00
parent d25767864b
commit 5350ccb9b2
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=20886
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -7,6 +7,7 @@
AWK?= /usr/bin/awk
GREP?= /usr/bin/grep
REALPATH?= /bin/realpath
.if defined(DOC_PREFIX) && !empty(DOC_PREFIX)
WEB_PREFIX?= ${DOC_PREFIX}/../www
@ -24,14 +25,14 @@ DOC_PREFIX?= ${WEB_PREFIX}/../doc
#
.if defined(DOC_PREFIX) && !empty(DOC_PREFIX)
DOC_PREFIX_NAME!= realpath ${DOC_PREFIX}
DOC_PREFIX_NAME!= ${REALPATH} ${DOC_PREFIX}
DOC_PREFIX_NAME:= ${DOC_PREFIX_NAME:T}
.else
DOC_PREFIX_NAME?= doc
.endif
.if defined(WEB_PREFIX) && !empty(WEB_PREFIX)
WWW_PREFIX_NAME!= realpath ${WEB_PREFIX}
WWW_PREFIX_NAME!= ${REALPATH} ${WEB_PREFIX}
WWW_PREFIX_NAME:= ${WWW_PREFIX_NAME:T}
.else
WWW_PREFIX_NAME?= www
@ -101,6 +102,10 @@ _WWW_LANGCODE:= ${_WWW2_LANGCODE}
.endif
WWW_LANGCODE?= ${_WWW_LANGCODE}
# normalize DOC_PREFIX and WEB_PREFIX
DOC_PREFIX!= ${REALPATH} ${DOC_PREFIX}
WEB_PREFIX!= ${REALPATH} ${WEB_PREFIX}
# ------------------------------------------------------------------------
#
# mirrors.xml dependency.
@ -163,7 +168,9 @@ CLEANFILES+= ${XML_MIRRORS}.sort.tmp
# urls.ent dependency.
#
URLS_ENT= ${.OBJDIR}/${DOC_PREFIX:S,^${.CURDIR}/,,}/share/sgml/urls.ent
# XXX: .OBJDIR does not work.
#URLS_ENT= ${.OBJDIR}/${DOC_PREFIX:S,^${.CURDIR}/,,}/share/sgml/urls.ent
URLS_ENT= ${DOC_PREFIX}/share/sgml/urls.ent
${URLS_ENT}:
.if !defined(URLS_ABSOLUTE)