From 360dd957227c3e62085f4186511e7c2626c2d596 Mon Sep 17 00:00:00 2001 From: Wolfram Schneider Date: Sun, 19 Sep 1999 11:56:18 +0000 Subject: [PATCH] Use a conditional assignment "?=" when defining $CATALOG Set variable $PREFIX --- en/web.mk | 5 +++-- share/mk/web.site.mk | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/en/web.mk b/en/web.mk index a140a8a119..ee3a8b578b 100644 --- a/en/web.mk +++ b/en/web.mk @@ -1,5 +1,5 @@ # bsd.web.mk -# $FreeBSD$ +# $FreeBSD: www/en/web.mk,v 1.23 1999/09/06 07:02:37 peter Exp $ # # Build and install a web site. @@ -60,7 +60,8 @@ PORTSBASE?= /usr .SUFFIXES: .sgml .html SGMLNORM= sgmlnorm -CATALOG?= /usr/local/share/sgml/html/catalog +PREFIX?= /usr/local +CATALOG?= ${PREFIX}/share/sgml/html/catalog SGMLNORMFLAGS= -d ${SGMLNORMOPTS} -c ${CATALOG} GENDOCS+= ${DOCS:M*.sgml:S/.sgml$/.html/g} ORPHANS:= ${ORPHANS:N*.sgml} diff --git a/share/mk/web.site.mk b/share/mk/web.site.mk index a140a8a119..ee3a8b578b 100644 --- a/share/mk/web.site.mk +++ b/share/mk/web.site.mk @@ -1,5 +1,5 @@ # bsd.web.mk -# $FreeBSD$ +# $FreeBSD: www/en/web.mk,v 1.23 1999/09/06 07:02:37 peter Exp $ # # Build and install a web site. @@ -60,7 +60,8 @@ PORTSBASE?= /usr .SUFFIXES: .sgml .html SGMLNORM= sgmlnorm -CATALOG?= /usr/local/share/sgml/html/catalog +PREFIX?= /usr/local +CATALOG?= ${PREFIX}/share/sgml/html/catalog SGMLNORMFLAGS= -d ${SGMLNORMOPTS} -c ${CATALOG} GENDOCS+= ${DOCS:M*.sgml:S/.sgml$/.html/g} ORPHANS:= ${ORPHANS:N*.sgml}