[xml/sgml-commit] [linuxdoc-tools] 03/12: Makefile.in: Build documentation in build target, not in install target.
Agustín Martín Domingo
agmartin at moszumanska.debian.org
Thu Oct 8 17:28:11 UTC 2015
This is an automated email from the git hooks/post-receive script.
agmartin pushed a commit to branch upstream
in repository linuxdoc-tools.
commit 7d755846b2bc664d9984f4365880d239d6736c60
Author: Agustin Martin Domingo <agmartin at debian.org>
Date: Wed Oct 7 13:14:34 2015 +0200
Makefile.in: Build documentation in build target, not in install target.
Signed-off-by: Agustin Martin Domingo <agmartin at debian.org>
---
ChangeLog | 9 +++++++--
Makefile.in | 25 ++++++++++++++-----------
2 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 7b0aedc..8d2153a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,16 @@
Changelog for linuxdoc-tools:
-This package is no longer packaged as Debian native and this
+This package is no longer packaged as Debian native and this
Changelog will only contain changes after that happened.
-For changes when this was packaged as a Debian native package,
+For changes when this was packaged as a Debian native package,
please see "doc/CHANGES.Debian-native".
+0.0.70:
+======
+ * Build documentation in build target, not in install target
+ (Debian #800537).
+
0.9.69:
=======
* Fix compilation with new flex. Thanks Martin Milata (Debian #700958).
diff --git a/Makefile.in b/Makefile.in
index c34abfe..61f6030 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -50,7 +50,9 @@ WARN =
CFLAGS = $(DEBUG) $(INCLUDE) $(WARN) $(PROFILE) $(OPTIMIZE)
LDFLAGS = $(DEBUG) $(PROFILE)
-all:
+all: build
+
+build:
ifeq ($(BUILD_SGMLSASP), true)
@echo "Compiling the SGML translator tools (in sgmls-1.1/)..."
( cd sgmls-1.1 ; \
@@ -85,6 +87,16 @@ endif
> genman/$$bn; \
done
+# -- Build documentation
+ @echo "Building documentation ..."
+ (cd doc; \
+ PREFIX=$(DESTDIR)$(prefix) \
+ AUXBINDIR=$(auxbin_ddir) \
+ PKGPERL5LIB=$(CURDIR)/perl5lib \
+ PKGDATADIR=$(CURDIR)/lib \
+ PKGENTITYMAPDIR=$(CURDIR)/entity-map \
+ bash Makedoc.sh)
+
install:: bin/linuxdoc
@echo "Installing binaries in $(bin_ddir) ..."
[ -d $(bin_ddir) ] || mkdir -m 755 -p $(bin_ddir)
@@ -161,16 +173,7 @@ endif
mkdir -m 755 -p $(tex_ddir)
$(INSTALL_DATA) tex/* $(tex_ddir)
-# -- Build and install documentation
- @echo "Installing documentation in $(doc_ddir) ..."
- (cd doc; \
- PREFIX=$(DESTDIR)$(prefix) \
- AUXBINDIR=$(auxbin_ddir) \
- PKGPERL5LIB=$(CURDIR)/perl5lib \
- PKGDATADIR=$(CURDIR)/lib \
- PKGENTITYMAPDIR=$(CURDIR)/entity-map \
- bash Makedoc.sh)
-
+# -- Install documentation
mkdir -m 755 -p $(doc_ddir)
# cp -r doc/* $(doc_ddir)
( cd doc && tar --exclude='CVS' -cpf - . ) | ( cd $(doc_ddir) && tar -xpf - )
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-xml-sgml/linuxdoc-tools.git
More information about the debian-xml-sgml-commit
mailing list