kill old readme (useless distinction).

Let make clean=readmes work.
This commit is contained in:
espie 2003-08-04 13:25:36 +00:00
parent 5be0c964a9
commit 0f9ceae51e
2 changed files with 18 additions and 9 deletions

View File

@ -1,6 +1,6 @@
#-*- mode: Makefile; tab-width: 4; -*-
# ex:ts=4 sw=4 filetype=make:
# $OpenBSD: bsd.port.mk,v 1.575 2003/08/02 09:53:27 espie Exp $
# $OpenBSD: bsd.port.mk,v 1.576 2003/08/04 13:25:36 espie Exp $
# $FreeBSD: bsd.port.mk,v 1.264 1996/12/25 02:27:44 imp Exp $
# $NetBSD: bsd.port.mk,v 1.62 1998/04/09 12:47:02 hubertf Exp $
#
@ -1842,6 +1842,12 @@ clean:
@cd ${.CURDIR} && exec ${MAKE} _delete-package-links
rm -f ${PKGFILE${SUBPACKAGE}}
. endif
. if ${_clean:L:Mreadmes}
rm -f ${.CURDIR}/${FULLPKGNAME}.html
. for _s in ${MULTI_PACKAGES}
rm -f ${.CURDIR}/${FULLPKGNAME${_s}}.html
. endfor
. endif
. if ${_clean:L:Mbulk}
rm -f ${_BULK_COOKIE}
. endif
@ -2062,7 +2068,7 @@ describe:
README_NAME?= ${TEMPLATES}/README.port
readme readmes:
readmes:
.if defined(MULTI_PACKAGES) && !defined(PACKAGING)
@cd ${.CURDIR} && SUBPACKAGE='${SUBPACKAGE}' FLAVOR='${FLAVOR}' PACKAGING='${SUBPACKAGE}' exec ${MAKE} readme
. if empty(SUBPACKAGE)
@ -2445,7 +2451,7 @@ uninstall deinstall:
pre-extract pre-fake pre-fetch \
pre-install pre-package pre-patch \
pre-regress print-build-depends print-run-depends \
readme readmes rebuild \
readmes rebuild \
regress regress-depends \
reinstall repackage run-depends \
run-depends-list run-dir-depends show \

View File

@ -1,7 +1,7 @@
#-*- mode: Makefile; tab-width: 4; -*-
# ex:ts=4 sw=4 filetype=make:
# from: @(#)bsd.subdir.mk 5.9 (Berkeley) 2/1/91
# $OpenBSD: bsd.port.subdir.mk,v 1.53 2003/08/02 09:58:11 espie Exp $
# $OpenBSD: bsd.port.subdir.mk,v 1.54 2003/08/04 13:25:36 espie Exp $
# FreeBSD Id: bsd.port.subdir.mk,v 1.20 1997/08/22 11:16:15 asami Exp
#
# The include file <bsd.port.subdir.mk> contains the default targets
@ -90,7 +90,7 @@ _SUBDIRUSE: .USE
.endfor
.for __target in all fetch fetch-list package fake extract configure \
build clean describe distclean deinstall install \
build describe distclean deinstall install \
reinstall tags checksum mirror-distfiles list-distfiles \
show fetch-makefile all-packages cdrom-packages \
dir-depends package-dir-depends \
@ -101,10 +101,13 @@ _SUBDIRUSE: .USE
${__target}: _SUBDIRUSE
.endfor
readmes: readme _SUBDIRUSE
clean: _SUBDIRUSE
.if ${clean:L:Mreadmes}
rm -f ${.CURDIR}/README.html
.endif
readme:
@rm -f README.html
readmes: _SUBDIRUSE
@rm -f ${.CURDIR}/README.html
@cd ${.CURDIR} && exec ${MAKE} README.html
TEMPLATES ?= ${PORTSDIR}/infrastructure/templates
@ -138,7 +141,7 @@ _print-packagename:
.PHONY: all fetch fetch-list package extract configure build clean \
describe distclean deinstall reinstall checksum mirror-distfiles \
list-distfiles show readmes readme \
list-distfiles show readmes \
install fake \
all-packages cdrom-packages ftp-packages packageinstall \
link-categories unlink-categories dir-depends package-dir-depends \