From eb908c6ebf8d6a46f18f2c0d547bba4509bbc031 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Mon, 1 Oct 2012 17:29:11 -0500 Subject: [PATCH] Make HTMLS_DIR default to . if not set. Remove HTMLS_DIR setting for files generated from DBD/POD. --- configure/RULES_BUILD | 2 ++ src/std/Makefile | 1 - src/tools/Makefile | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure/RULES_BUILD b/configure/RULES_BUILD index a0699e5d2..0c6e7bd9e 100644 --- a/configure/RULES_BUILD +++ b/configure/RULES_BUILD @@ -68,6 +68,8 @@ else INSTALL_TEMPLATES_SUBDIR = $(INSTALL_TEMPLATES) endif +HTMLS_DIR ?= . + #--------------------------------------------------------------- # First target diff --git a/src/std/Makefile b/src/std/Makefile index 63ef02054..cde499d75 100644 --- a/src/std/Makefile +++ b/src/std/Makefile @@ -11,7 +11,6 @@ TOP=../.. include $(TOP)/configure/CONFIG STDDIR=$(TOP)/src/std -HTMLS_DIR = std LIBRARY_IOC += dbRecStd dbRecStd_LIBS = dbCore ca Com diff --git a/src/tools/Makefile b/src/tools/Makefile index 88707df47..d62e4bba1 100644 --- a/src/tools/Makefile +++ b/src/tools/Makefile @@ -51,7 +51,6 @@ PERL_SCRIPTS += dbdExpand.pl PERL_SCRIPTS += dbdToHtml.pl PERL_SCRIPTS += registerRecordDeviceDriver.pl -HTMLS_DIR = std HTMLS = style.css include $(TOP)/configure/RULES