Author: vedge
Date: 2008-03-14 00:04:16 -0300 (Fri, 14 Mar 2008)
New Revision: 698
Modified:
trunk/build.www.mk
Log:
add HTML_INSTSOURCE option
Modified: trunk/build.www.mk
===================================================================
--- trunk/build.www.mk 2008-03-14 01:54:41 UTC (rev 697)
+++ trunk/build.www.mk 2008-03-14 03:04:16 UTC (rev 698)
@@ -38,11 +38,13 @@
DEF_LANGUAGE?= en
XSL?= ${XSLDIR}/ml.xsl
MKDEPS= build.www.mk build.subdir.mk build.common.mk hstrip.pl
+CLEANFILES?=
+HTMLDIR?= none
HTML?=
-HTMLDIR?= none
-HTML_OVERWRITE= No
-CLEANFILES?=
+HTML_OVERWRITE?= No
+HTML_INSTSOURCE?= Yes
+
all: ${HTML} all-subdir
clean: clean-www clean-subdir
cleandir: clean-www clean-subdir cleandir-subdir
@@ -122,13 +124,12 @@
@if [ "${HTMLDIR}" = "none" ]; then \
exit 0; \
fi
- @for F in ${HTML}; do \
- rm -f $$F; \
- if [ ! -d "${HTMLDIR}" ]; then \
- echo "${INSTALL_DATA_DIR} ${HTMLDIR}"; \
- ${SUDO} ${INSTALL_DATA_DIR} ${HTMLDIR}; \
- fi; \
- if [ ! -d "${HTMLDIR}/mk" ]; then \
+ @if [ ! -d "${HTMLDIR}" ]; then \
+ echo "${INSTALL_DATA_DIR} ${HTMLDIR}"; \
+ ${SUDO} ${INSTALL_DATA_DIR} ${HTMLDIR}; \
+ fi
+ @if [ "${HTML_INSTSOURCE}" = "Yes" ]; then \
+ if [ ! -d "${HTMLDIR}/mk" ]; then \
echo "${INSTALL_DATA_DIR} ${HTMLDIR}/mk"; \
${SUDO} ${INSTALL_DATA_DIR} ${HTMLDIR}/mk; \
fi; \
@@ -136,7 +137,7 @@
echo "${INSTALL_DATA} ${TOP}/mk/$$MK ${HTMLDIR}/mk"; \
${SUDO} ${INSTALL_DATA} ${TOP}/mk/$$MK ${HTMLDIR}/mk; \
done; \
- if [ ! -d "${HTMLDIR}/xsl" ]; then \
+ if [ ! -d "${HTMLDIR}/xsl" ]; then \
echo "${INSTALL_DATA_DIR} ${HTMLDIR}/xsl"; \
${SUDO} ${INSTALL_DATA_DIR} ${HTMLDIR}/xsl; \
fi; \
@@ -149,7 +150,7 @@
${SUDO} ${INSTALL_DATA} $$XSL ${HTMLDIR}/xsl; \
fi; \
done; \
- if [ ! -d "${HTMLDIR}/m4" ]; then \
+ if [ ! -d "${HTMLDIR}/m4" ]; then \
echo "${INSTALL_DATA_DIR} ${HTMLDIR}/m4"; \
${SUDO} ${INSTALL_DATA_DIR} ${HTMLDIR}/m4; \
fi; \
@@ -162,7 +163,11 @@
${SUDO} ${INSTALL_DATA} $$M4IN ${HTMLDIR}/m4; \
fi; \
done); \
- if [ ! -e "${HTMLDIR}/Makefile" ]; then \
+ fi
+ @for F in ${HTML}; do \
+ rm -f $$F; \
+ if [ "${HTML_INSTSOURCE}" = "Yes" -a \
+ ! -e "${HTMLDIR}/Makefile" ]; then \
echo "TOP=." > Makefile.prep; \
echo "HTML=${HTML}" >> Makefile.prep; \
echo "HTMLDIR=none" >> Makefile.prep; \
@@ -180,13 +185,15 @@
${HTMLDIR}/Makefile; \
rm -f Makefile.prep; \
fi; \
- export SF=`echo $$F |sed s,.html$$,.htm,`; \
- if [ -e "${HTMLDIR}/$$SF" \
- -a "${HTML_OVERWRITE}" = "" ]; then \
- echo "$$SF exists; preserving"; \
- else \
- echo "${INSTALL_DATA} $$SF ${HTMLDIR}"; \
- ${SUDO} ${INSTALL_DATA} $$SF ${HTMLDIR}; \
+ if [ "${HTML_INSTSOURCE}" = "Yes" ]; then \
+ export SF=`echo $$F |sed s,.html$$,.htm,`; \
+ if [ -e "${HTMLDIR}/$$SF" \
+ -a "${HTML_OVERWRITE}" = "" ]; then \
+ echo "$$SF exists; preserving"; \
+ else \
+ echo "${INSTALL_DATA} $$SF ${HTMLDIR}"; \
+ ${SUDO} ${INSTALL_DATA} $$SF ${HTMLDIR}; \
+ fi; \
fi; \
if [ -e "${HTMLDIR}/$$F.var" \
-a "${HTML_OVERWRITE}" = "" ]; then \
_______________________________________________
BSDBuild-Commits mailing list
[email protected]
http://mail231.csoft.net/mailman/listinfo/bsdbuild-commits
