[libxslt] Remove --with-html-dir option
- From: Nick Wellnhofer <nwellnhof src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libxslt] Remove --with-html-dir option
- Date: Thu, 31 Mar 2022 00:00:26 +0000 (UTC)
commit 25652d85fde6a168346e03e36bd721687080cb87
Author: Nick Wellnhofer <wellnhofer aevum de>
Date: Thu Mar 31 00:28:52 2022 +0200
Remove --with-html-dir option
Install documentation in $(docdir).
configure.ac | 15 ---------------
doc/Makefile.am | 23 +++++++----------------
2 files changed, 7 insertions(+), 31 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 9cc5af8e..acb6177d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -75,21 +75,6 @@ AM_INIT_AUTOMAKE([foreign])
# to make
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-dnl
-dnl Specific dir for HTML output ?
-dnl
-
-AC_ARG_WITH(html-dir, AS_HELP_STRING([--with-html-dir=path],
- [path to base html directory, default $datadir/doc/html]),
- [HTML_DIR=$withval], [HTML_DIR='$(datadir)/doc'])
-
-AC_ARG_WITH(html-subdir, AS_HELP_STRING([--with-html-subdir=path],
- [directory used under html-dir, default $PACKAGE-$VERSION/html]),
- [test "x$withval" != "x" && HTML_DIR="$HTML_DIR/$withval"],
- [HTML_DIR="$HTML_DIR/\$(PACKAGE)-\$(VERSION)/html"])
-
-AC_SUBST(HTML_DIR)
-
dnl
dnl Check the environment
dnl
diff --git a/doc/Makefile.am b/doc/Makefile.am
index f18c72fd..8bd67cb3 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -25,16 +25,18 @@ EXTRA_DIST = \
libxslt-refs.xml \
symbols.xml \
syms.xsl \
- tutorial/libxslt_tutorial.c \
- tutorial/libxslttutorial.html \
tutorial/libxslttutorial.xml \
- tutorial2/libxslt_pipes.c \
- tutorial2/libxslt_pipes.html \
tutorial2/libxslt_pipes.xml \
xsltproc.1 \
- xsltproc.html \
xsltproc.xml
+nobase_doc_DATA = \
+ tutorial/libxslt_tutorial.c \
+ tutorial/libxslttutorial.html \
+ tutorial2/libxslt_pipes.c \
+ tutorial2/libxslt_pipes.html \
+ xsltproc.html
+
man_MANS = xsltproc.1
rebuild:
@@ -72,15 +74,4 @@ check-extra-dist:
test -n "$$present" || echo "not in EXTRA_DIST: $$a" ; \
done
-install-data-local:
- $(MKDIR_P) $(DESTDIR)$(HTML_DIR)
- -$(INSTALL) -m 0644 $(srcdir)/xsltproc.html $(DESTDIR)$(HTML_DIR)
- $(MKDIR_P) $(DESTDIR)$(HTML_DIR)/tutorial
- -$(INSTALL) -m 0644 $(srcdir)/tutorial/* $(DESTDIR)$(HTML_DIR)/tutorial
- $(MKDIR_P) $(DESTDIR)$(HTML_DIR)/tutorial2
- -$(INSTALL) -m 0644 $(srcdir)/tutorial2/* $(DESTDIR)$(HTML_DIR)/tutorial2
-
-uninstall-local:
- rm -rf $(DESTDIR)$(HTML_DIR)
-
.PHONY : rebuild check-extra-dist
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]