From 951de3fa8ac870fd301ffc1bc87f7f829beb8ebf Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@jannet.de>
Date: Thu, 23 Aug 2007 15:25:10 +0000
Subject: [PATCH] defs.mk, rules.mk: Streamlined DOC handling

---
 make/defs.mk  | 12 +++++++-----
 make/rules.mk |  4 ----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/make/defs.mk b/make/defs.mk
index dff27be2..0612cc4b 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -188,13 +188,15 @@ INSTALL_HDRDIR        ?= $(PREFIX)/include
 INSTALLED_HDR         += $(addprefix $(INSTALL_HDRDIR)/,$(SRC_H))
 
 # -- DOC
-# TODO: VERSION file is omnipresent
-BUILD_DOCDIR          ?= $(TOPDIR)/doc
 DOCS                  += $(wildcard VERSION README CHANGES TODO LICENSE AUTHORS CREDITS *.pdf *.txt *.html)
 DOCSUBDIRS            += $(wildcard html tex info examples src)
-INSTALLED_VERSION_FILE = $(PREFIX)/VERSION
-INSTALL_DOCDIR         = $(DOC_PREFIX)
-INSTALLED_DOCS         = $(addprefix $(INSTALL_DOCDIR)/,$(DOCS)) $(INSTALLED_VERSION_FILE)
+
+BUILD_DOCDIR          ?= $(TOPDIR)/doc
+BUILD_DOC             ?= $(DOC_PREFIX)
+# TODO: use INSTALL_DOCDIR ?= $(DOC_PREFIX) which currently would break
+#       <MODULE>_VERSION below
+INSTALL_DOCDIR        ?= $(PREFIX)
+INSTALLED_DOC         ?= $(addprefix $(INSTALL_DOCDIR)/,$(DOCS))
 
 # -- LIB
 BUILD_LIBDIR           = $(TOPDIR)/lib
diff --git a/make/rules.mk b/make/rules.mk
index 084ea974..dc5db3dc 100644
--- a/make/rules.mk
+++ b/make/rules.mk
@@ -293,10 +293,6 @@ $(INSTALLED_PROFILE_PATH_SCRIPT): $(TOPDIR)/profiledir.done
 	echo "else PATH=\$$PATH:$(shell echo $(INSTALL_EXEDIR) | sed -e s%^$(ENV_PREFIX)/%/%); fi" >> path_script.sh
 	$(INSTALL) -o $(PROFILEOWNER) -g $(PROFILEGROUP) -m $(PROFILEMODE) path_script.sh $@
 
-$(INSTALLED_VERSION_FILE):
-	$(INSTALL) -o $(DOCOWNER) -g $(DOCGROUP) -m $(DOCMODE) $(TOPDIR)/VERSION $@
-	echo $(DIST_VERSION) > $@
-
 $(SYSCONFIG_DIR)/%: %
 	$(INSTALL) -o $(CFGOWNER) -g $(CFGGROUP) -m $(CFGMODE) $< $@