48 lines
1.7 KiB
Diff
48 lines
1.7 KiB
Diff
From 8116c08e4d24087d35f7ad949f754a5207e2eef8 Mon Sep 17 00:00:00 2001
|
|
From: Ben Hutchings <ben@decadent.org.uk>
|
|
Date: Sat, 21 Nov 2009 04:01:56 +0000
|
|
Subject: [PATCH 1/2] DocBook/media: copy images after building HTML
|
|
|
|
The rule for %.html removes the output directory, so there is no point
|
|
in copying images before building HTML.
|
|
---
|
|
Documentation/DocBook/Makefile | 10 +++++-----
|
|
1 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
|
|
index ab8300f..22bbf7e 100644
|
|
--- a/Documentation/DocBook/Makefile
|
|
+++ b/Documentation/DocBook/Makefile
|
|
@@ -32,7 +32,7 @@ PS_METHOD = $(prefer-db2x)
|
|
|
|
###
|
|
# The targets that may be used.
|
|
-PHONY += xmldocs sgmldocs psdocs pdfdocs htmldocs mandocs installmandocs cleandocs media
|
|
+PHONY += xmldocs sgmldocs psdocs pdfdocs htmldocs mandocs installmandocs cleandocs
|
|
|
|
BOOKS := $(addprefix $(obj)/,$(DOCBOOKS))
|
|
xmldocs: $(BOOKS)
|
|
@@ -45,15 +45,15 @@ PDF := $(patsubst %.xml, %.pdf, $(BOOKS))
|
|
pdfdocs: $(PDF)
|
|
|
|
HTML := $(sort $(patsubst %.xml, %.html, $(BOOKS)))
|
|
-htmldocs: media $(HTML)
|
|
+htmldocs: $(HTML)
|
|
$(call build_main_index)
|
|
+ $(call build_images)
|
|
|
|
MAN := $(patsubst %.xml, %.9, $(BOOKS))
|
|
mandocs: $(MAN)
|
|
|
|
-media:
|
|
- mkdir -p $(srctree)/Documentation/DocBook/media/
|
|
- cp $(srctree)/Documentation/DocBook/dvb/*.png $(srctree)/Documentation/DocBook/v4l/*.gif $(srctree)/Documentation/DocBook/media/
|
|
+build_images = mkdir -p $(objtree)/Documentation/DocBook/media/ && \
|
|
+ cp $(srctree)/Documentation/DocBook/dvb/*.png $(srctree)/Documentation/DocBook/v4l/*.gif $(objtree)/Documentation/DocBook/media/
|
|
|
|
installmandocs: mandocs
|
|
mkdir -p /usr/local/man/man9/
|
|
--
|
|
1.6.5.2
|
|
|