Finish the last commit, so that the html-split files are now properly
tar'ed and installed. Prompted by JKH. Turn 'distribute' in to a NOP, so that the LinuxDoc Handbook is not smashed by this one during "make release". We're almost ready to do the switch. . .
This commit is contained in:
parent
02fd39ab9e
commit
eb68f8d9e6
Notes:
svn2git
2020-12-08 03:00:23 +00:00
svn path=/head/; revision=4563
3 changed files with 42 additions and 15 deletions
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# $Id: Makefile,v 1.15 1999-03-18 20:37:12 nik Exp $
|
||||
# $Id: Makefile,v 1.16 1999-03-22 22:16:23 nik Exp $
|
||||
#
|
||||
# Build the FreeBSD Handbook. Will eventually split in two, a generic .mk
|
||||
# file which can be used by many Makefiles, and a much smaller Makefile
|
||||
|
@ -196,9 +196,14 @@ CLEANFILES+= ${DOC}.tar
|
|||
.for _curformat in ${FORMATS}
|
||||
_cf=${_curformat}
|
||||
.for _curcomp in ${INSTALL_COMPRESSED}
|
||||
.if ${_cf} == "html-split"
|
||||
_curinst+= install-html-split.tar.${_curcomp}
|
||||
_docs+= ${DOC}.html-split.tar.${_curcomp}
|
||||
.else
|
||||
_curinst+= install-${_curformat}.${_curcomp}
|
||||
_docs+= ${DOC}.${_curformat}.${_curcomp}
|
||||
CLEANFILES+= ${DOC}.${_curformat}.${_curcomp}
|
||||
.endif
|
||||
.endfor
|
||||
.endfor
|
||||
.endif
|
||||
|
@ -349,7 +354,7 @@ install-${_cf}: index.html
|
|||
sh ${.OBJDIR}/${DOC}.ln); \
|
||||
fi
|
||||
.for _compressext in ${KNOWN_COMPRESS}
|
||||
install-${_cf}.${_compressext}: ${DOC}.${_cf}.tar.${_compressext}
|
||||
install-${_cf}.tar.${_compressext}: ${DOC}.${_cf}.tar.${_compressext}
|
||||
${INSTALL} ${COPY} -o ${DOCOWN} -g ${DOCGRP} -m ${DOCMODE} \
|
||||
${.ALLSRC} ${DESTDIR}${DOCDIR}/${VOLUME}
|
||||
.endfor
|
||||
|
@ -378,11 +383,15 @@ ${__target}:
|
|||
#
|
||||
# Like "install", but places the files into the correct distribution
|
||||
#
|
||||
#.if !target(distribute)
|
||||
#distribute:
|
||||
#.for dist in ${DISTRIBUTION}
|
||||
# cd ${.CURDIR}; $(MAKE) install DESTDIR=${DISTDIR}/${dist}
|
||||
#.endfor
|
||||
#.endif
|
||||
.if !target(distribute)
|
||||
distribute:
|
||||
.for dist in ${DISTRIBUTION}
|
||||
cd ${.CURDIR}; $(MAKE) install DESTDIR=${DISTDIR}/${dist}
|
||||
.endfor
|
||||
@echo "'distribute' not yet enabled for DocBook Handbook"
|
||||
.endif
|
||||
|
||||
.include <bsd.dep.mk>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# $Id: Makefile,v 1.15 1999-03-18 20:37:12 nik Exp $
|
||||
# $Id: Makefile,v 1.16 1999-03-22 22:16:23 nik Exp $
|
||||
#
|
||||
# Build the FreeBSD Handbook. Will eventually split in two, a generic .mk
|
||||
# file which can be used by many Makefiles, and a much smaller Makefile
|
||||
|
@ -196,9 +196,14 @@ CLEANFILES+= ${DOC}.tar
|
|||
.for _curformat in ${FORMATS}
|
||||
_cf=${_curformat}
|
||||
.for _curcomp in ${INSTALL_COMPRESSED}
|
||||
.if ${_cf} == "html-split"
|
||||
_curinst+= install-html-split.tar.${_curcomp}
|
||||
_docs+= ${DOC}.html-split.tar.${_curcomp}
|
||||
.else
|
||||
_curinst+= install-${_curformat}.${_curcomp}
|
||||
_docs+= ${DOC}.${_curformat}.${_curcomp}
|
||||
CLEANFILES+= ${DOC}.${_curformat}.${_curcomp}
|
||||
.endif
|
||||
.endfor
|
||||
.endfor
|
||||
.endif
|
||||
|
@ -349,7 +354,7 @@ install-${_cf}: index.html
|
|||
sh ${.OBJDIR}/${DOC}.ln); \
|
||||
fi
|
||||
.for _compressext in ${KNOWN_COMPRESS}
|
||||
install-${_cf}.${_compressext}: ${DOC}.${_cf}.tar.${_compressext}
|
||||
install-${_cf}.tar.${_compressext}: ${DOC}.${_cf}.tar.${_compressext}
|
||||
${INSTALL} ${COPY} -o ${DOCOWN} -g ${DOCGRP} -m ${DOCMODE} \
|
||||
${.ALLSRC} ${DESTDIR}${DOCDIR}/${VOLUME}
|
||||
.endfor
|
||||
|
@ -378,11 +383,15 @@ ${__target}:
|
|||
#
|
||||
# Like "install", but places the files into the correct distribution
|
||||
#
|
||||
#.if !target(distribute)
|
||||
#distribute:
|
||||
#.for dist in ${DISTRIBUTION}
|
||||
# cd ${.CURDIR}; $(MAKE) install DESTDIR=${DISTDIR}/${dist}
|
||||
#.endfor
|
||||
#.endif
|
||||
.if !target(distribute)
|
||||
distribute:
|
||||
.for dist in ${DISTRIBUTION}
|
||||
cd ${.CURDIR}; $(MAKE) install DESTDIR=${DISTDIR}/${dist}
|
||||
.endfor
|
||||
@echo "'distribute' not yet enabled for DocBook Handbook"
|
||||
.endif
|
||||
|
||||
.include <bsd.dep.mk>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# $Id: Makefile,v 1.15 1999-03-18 20:37:12 nik Exp $
|
||||
# $Id: Makefile,v 1.16 1999-03-22 22:16:23 nik Exp $
|
||||
#
|
||||
# Build the FreeBSD Handbook. Will eventually split in two, a generic .mk
|
||||
# file which can be used by many Makefiles, and a much smaller Makefile
|
||||
|
@ -196,9 +196,14 @@ CLEANFILES+= ${DOC}.tar
|
|||
.for _curformat in ${FORMATS}
|
||||
_cf=${_curformat}
|
||||
.for _curcomp in ${INSTALL_COMPRESSED}
|
||||
.if ${_cf} == "html-split"
|
||||
_curinst+= install-html-split.tar.${_curcomp}
|
||||
_docs+= ${DOC}.html-split.tar.${_curcomp}
|
||||
.else
|
||||
_curinst+= install-${_curformat}.${_curcomp}
|
||||
_docs+= ${DOC}.${_curformat}.${_curcomp}
|
||||
CLEANFILES+= ${DOC}.${_curformat}.${_curcomp}
|
||||
.endif
|
||||
.endfor
|
||||
.endfor
|
||||
.endif
|
||||
|
@ -349,7 +354,7 @@ install-${_cf}: index.html
|
|||
sh ${.OBJDIR}/${DOC}.ln); \
|
||||
fi
|
||||
.for _compressext in ${KNOWN_COMPRESS}
|
||||
install-${_cf}.${_compressext}: ${DOC}.${_cf}.tar.${_compressext}
|
||||
install-${_cf}.tar.${_compressext}: ${DOC}.${_cf}.tar.${_compressext}
|
||||
${INSTALL} ${COPY} -o ${DOCOWN} -g ${DOCGRP} -m ${DOCMODE} \
|
||||
${.ALLSRC} ${DESTDIR}${DOCDIR}/${VOLUME}
|
||||
.endfor
|
||||
|
@ -378,11 +383,15 @@ ${__target}:
|
|||
#
|
||||
# Like "install", but places the files into the correct distribution
|
||||
#
|
||||
#.if !target(distribute)
|
||||
#distribute:
|
||||
#.for dist in ${DISTRIBUTION}
|
||||
# cd ${.CURDIR}; $(MAKE) install DESTDIR=${DISTDIR}/${dist}
|
||||
#.endfor
|
||||
#.endif
|
||||
.if !target(distribute)
|
||||
distribute:
|
||||
.for dist in ${DISTRIBUTION}
|
||||
cd ${.CURDIR}; $(MAKE) install DESTDIR=${DISTDIR}/${dist}
|
||||
.endfor
|
||||
@echo "'distribute' not yet enabled for DocBook Handbook"
|
||||
.endif
|
||||
|
||||
.include <bsd.dep.mk>
|
||||
|
|
Loading…
Reference in a new issue