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

doc.images.mk

Browse source 
LOCAL_LIB_IMAGES_DIR should be a path component, not a complete path, so
remove ${.CURDIR}.

doc.docbook.mk

Set the directory for image installation correctly, and ensure that the
directory exists before we try and do anything with it.

These should fix the installation problems people are having with the
primer.  There's still an outstanding bug -- make(1) thinks that the
local library images are out-of-date with respect to the ones in
share/images for some reason.  This forces a rebuild each time.  I'm
still looking at that.
This commit is contained in:
Nik Clayton 2000-07-18 16:30:45 +00:00
parent 4f74df5283
commit f631452350
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=7664
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
share/mk/doc.docbook.mk
View file

@ -1,5 +1,5 @@
#
# $FreeBSD: doc/share/mk/doc.docbook.mk,v 1.14 2000/07/17 08:51:38 nbm Exp $
# $FreeBSD: doc/share/mk/doc.docbook.mk,v 1.15 2000/07/17 22:30:03 nik Exp $
#
# This include file <doc.docbook.mk> handles building and installing of
# DocBook documentation in the FreeBSD Documentation Project.
@ -328,7 +328,8 @@ install-${_cf}: index.html
(cd ${DESTDIR}; sh ${.OBJDIR}/${DOC}.ln); \
fi
.for _curimage in ${LIB_IMAGES}
${INSTALL_DOCS} ${_curimage} ${DESTDIR}/${_curimage:H}
@[ -d ${DESTDIR}/${LOCAL_LIB_IMAGES_DIR}/${_curimage:H} ] || mkdir -p ${DESTDIR}/${LOCAL_LIB_IMAGES_DIR}/${_curimage:H}
${INSTALL_DOCS} ${LOCAL_LIB_IMAGES_DIR}/${_curimage} ${DESTDIR}/${LOCAL_LIB_IMAGES_DIR}/${_curimage:H}
.endfor
.for _compressext in ${KNOWN_COMPRESS}
install-${_cf}.tar.${_compressext}: ${DOC}.${_cf}.tar.${_compressext}
@ -340,7 +341,8 @@ install-${_cf}: ${DOC}.${_cf}
@[ -d ${DESTDIR} ] || mkdir -p ${DESTDIR}
${INSTALL_DOCS} ${.ALLSRC} ${DESTDIR}
.for _curimage in ${LIB_IMAGES}
${INSTALL_DOCS} ${_curimage} ${DESTDIR}/${_curimage:H}
@[ -d ${DESTDIR}/${LOCAL_LIB_IMAGES_DIR}/${_curimage:H} ] || mkdir -p ${DESTDIR}/${LOCAL_LIB_IMAGES_DIR}/${_curimage:H}
${INSTALL_DOCS} ${LOCAL_LIB_IMAGES_DIR}/${_curimage} ${DESTDIR}/${LOCAL_LIB_IMAGES_DIR}/${_curimage:H}
.endfor
.else
install-${_cf}: ${DOC}.${_cf}

4
share/mk/doc.images.mk
View file

@ -1,5 +1,5 @@
#
# $FreeBSD$
# $FreeBSD: doc/share/mk/doc.images.mk,v 1.1 2000/07/16 16:27:30 nik Exp $
#
# This include file <doc.images.mk> handles image processing.
#
@ -49,7 +49,7 @@ LIB_IMAGES_DIR?= ${.CURDIR}/../../share/images
# instead. If you redefine this then you must also update the
# %callout-graphics-path% variable in the .dsl file.
#
LOCAL_LIB_IMAGES_DIR?= ${.CURDIR}/imagelib
LOCAL_LIB_IMAGES_DIR?= imagelib
CP?= /bin/cp
MKDIR?= /bin/mkdir