diff options
| author | rillig <rillig@pkgsrc.org> | 2005-10-07 17:39:28 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2005-10-07 17:39:28 +0000 |
| commit | 26cc823fb4735b3c1e63532ae1d23ead188006a5 (patch) | |
| tree | 3ca61defbe7a1b734ed605006123e7168948ecf8 /mk | |
| parent | ff58f81fd1ab95603c3eef92e8657b9238f1d63d (diff) | |
| download | pkgsrc-26cc823fb4735b3c1e63532ae1d23ead188006a5.tar.gz | |
Renamed HTML_PKGNAME to _HTML_PKGLINK, which describes its contents more
precisely. Added _HTML_PKGNAME and _HTML_PKGPATH variables for better
readability. Fixed quoting style in print-summary-data.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 6f6593b5d2a..145ed54e59b 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1727 2005/10/07 16:57:14 rillig Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1728 2005/10/07 17:39:28 rillig Exp $ # # This file is in the public domain. # @@ -3542,14 +3542,15 @@ bin-install: # This variable is passed down via build-depends-list and run-depends-list PACKAGE_NAME_TYPE?= name -# Nobody should want to override this unless PKGNAME is simply bogus. -HTML_PKGNAME=<a href="../../${PKGPATH:S/&/\&/g:S/>/\>/g:S/</\</g}/README.html">${PKGNAME:S/&/\&/g:S/>/\>/g:S/</\</g}</A> +_HTML_PKGNAME= ${PKGNAME:S/&/\&/g:S/>/\>/g:S/</\</g} +_HTML_PKGPATH= ${PKGPATH:S/&/\&/g:S/>/\>/g:S/</\</g} +_HTML_PKGLINK= <a href="../../${_HTML_PKGPATH}/README.html">${_HTML_PKGNAME}</a> .PHONY: package-name .if !target(package-name) package-name: . if (${PACKAGE_NAME_TYPE} == "html") - @${ECHO} '<a href="../../${PKGPATH:S/&/\&/g:S/>/\>/g:S/</\</g}/README.html">${PKGNAME:S/&/\&/g:S/>/\>/g:S/</\</g}</A>' + @${ECHO} ${_HTML_PKGLINK:Q} . elif (${PACKAGE_NAME_TYPE} == "svr4") @${ECHO} ${SVR4_PKGNAME} . else @@ -3918,11 +3919,11 @@ print-run-depends-list: .PHONY: print-summary-data .if !target(print-summary-data) print-summary-data: - @${ECHO} "depends ${PKGPATH} ${DEPENDS}" - @${ECHO} "build_depends ${PKGPATH} ${BUILD_DEPENDS}" - @${ECHO} "conflicts ${PKGPATH} ${CONFLICTS}" - @${ECHO} "index ${PKGPATH} ${PKGNAME}" - @${ECHO} htmlname ${PKGPATH} ${HTML_PKGNAME:Q} + @${ECHO} depends ${PKGPATH} ${DEPENDS:Q} + @${ECHO} build_depends ${PKGPATH} ${BUILD_DEPENDS:Q} + @${ECHO} conflicts ${PKGPATH} ${CONFLICTS:Q} + @${ECHO} index ${PKGPATH} ${PKGNAME:Q} + @${ECHO} htmlname ${PKGPATH} ${_HTML_PKGLINK:Q} @${ECHO} homepage ${PKGPATH} ${HOMEPAGE:Q} @${ECHO} wildcard ${PKGPATH} ${PKGWILDCARD:Q} @${ECHO} comment ${PKGPATH} ${COMMENT:Q} |