shaba/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-07-12 08:59:34 +03:00
Code Activity

Refactor the settings of $docdir

Browse Source 
This is a completely noop change for this project, since before this
commit nothing was using $docdir nor PROGRAM_TARNAME.

Setting the fourth parameter of AC_INIT() makes it set PROGRAM_TARNAME,
which then used as the last path component of the default docdir,
effectively making $docdir be the same as the previous
$BASE_DIR/$DOC_MODULE.

Signed-off-by: Mattia Rizzolo <mattia@mapreri.org>
This commit is contained in:
Mattia Rizzolo
2021-07-29 12:11:08 +02:00
committed by Nick Wellnhofer
parent 51c88c6f8d
commit 7c0253aadf
2 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile.am
View File

@ -1273,13 +1273,11 @@ cmake_DATA = libxml2-config.cmake
# #
# Install the tests program sources as examples # Install the tests program sources as examples
# #
BASE_DIR=$(datadir)/doc EXAMPLES_DIR=$(docdir)/examples
DOC_MODULE=libxml2-$(VERSION)
EXAMPLES_DIR=$(BASE_DIR)/$(DOC_MODULE)/examples
install-data-local: install-data-local:
$(MKDIR_P) $(DESTDIR)$(BASE_DIR)/$(DOC_MODULE) $(MKDIR_P) $(DESTDIR)$(docdir)
-$(INSTALL) -m 0644 $(srcdir)/Copyright $(DESTDIR)$(BASE_DIR)/$(DOC_MODULE) -$(INSTALL) -m 0644 $(srcdir)/Copyright $(DESTDIR)$(docdir)
$(MKDIR_P) $(DESTDIR)$(EXAMPLES_DIR) $(MKDIR_P) $(DESTDIR)$(EXAMPLES_DIR)
-$(INSTALL) -m 0644 $(srcdir)/xmllint.c $(DESTDIR)$(EXAMPLES_DIR) -$(INSTALL) -m 0644 $(srcdir)/xmllint.c $(DESTDIR)$(EXAMPLES_DIR)
-$(INSTALL) -m 0644 $(srcdir)/testSAX.c $(DESTDIR)$(EXAMPLES_DIR) -$(INSTALL) -m 0644 $(srcdir)/testSAX.c $(DESTDIR)$(EXAMPLES_DIR)
@ -1292,8 +1290,8 @@ uninstall-local:
rm -f $(DESTDIR)$(EXAMPLES_DIR)/testSAX.c rm -f $(DESTDIR)$(EXAMPLES_DIR)/testSAX.c
rm -f $(DESTDIR)$(EXAMPLES_DIR)/xmllint.c rm -f $(DESTDIR)$(EXAMPLES_DIR)/xmllint.c
rm -rf $(DESTDIR)$(EXAMPLES_DIR) rm -rf $(DESTDIR)$(EXAMPLES_DIR)
rm -f $(DESTDIR)$(BASE_DIR)/$(DOC_MODULE)/Copyright rm -f $(DESTDIR)$(docdir)/Copyright
rm -rf $(DESTDIR)$(BASE_DIR)/$(DOC_MODULE) rm -rf $(DESTDIR)$(docdir)
tst: tst.c tst: tst.c
$(CC) $(CFLAGS) -Iinclude -o tst tst.c .libs/libxml2.a -lpthread -lm -lz -llzma $(CC) $(CFLAGS) -Iinclude -o tst tst.c .libs/libxml2.a -lpthread -lm -lz -llzma

11
configure.ac
View File

@ -5,7 +5,7 @@ m4_define([MAJOR_VERSION], 2)
m4_define([MINOR_VERSION], 9) m4_define([MINOR_VERSION], 9)
m4_define([MICRO_VERSION], 12) m4_define([MICRO_VERSION], 12)
AC_INIT([libxml2],[MAJOR_VERSION.MINOR_VERSION.MICRO_VERSION]) AC_INIT([libxml2],[MAJOR_VERSION.MINOR_VERSION.MICRO_VERSION],[],[libxml2-MAJOR_VERSION.MINOR_VERSION.MICRO_VERSION])
AC_CONFIG_SRCDIR([entities.c]) AC_CONFIG_SRCDIR([entities.c])
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([config.h])
AM_MAINTAINER_MODE([enable]) AM_MAINTAINER_MODE([enable])
@ -124,13 +124,12 @@ AC_ARG_WITH(html,
[ --with-html add the HTML support (on)]) [ --with-html add the HTML support (on)])
dnl Specific dir for HTML output ? dnl Specific dir for HTML output ?
AC_ARG_WITH(html-dir, AS_HELP_STRING([--with-html-dir=path], AC_ARG_WITH(html-dir, AS_HELP_STRING([--with-html-dir=path],
[path to base html directory, default $datadir/doc/html]), [path to base html directory, default $docdir/html]),
[HTML_DIR=$withval], [HTML_DIR='$(datadir)/doc']) [HTML_DIR=$withval], [HTML_DIR='$(docdir)/html'])
AC_ARG_WITH(html-subdir, AS_HELP_STRING([--with-html-subdir=path], AC_ARG_WITH(html-subdir, AS_HELP_STRING([--with-html-subdir=path],
[directory used under html-dir, default $PACKAGE-$VERSION/html]), [directory used under html-dir, default '']),
[test "x$withval" != "x" && HTML_DIR="$HTML_DIR/$withval"], [test "x$withval" != "x" && HTML_DIR="$HTML_DIR/$withval"])
[HTML_DIR="$HTML_DIR/\$(PACKAGE)-\$(VERSION)/html"])
AC_SUBST(HTML_DIR) AC_SUBST(HTML_DIR)
AC_ARG_WITH(http, AC_ARG_WITH(http,
[ --with-http add the HTTP support (on)]) [ --with-http add the HTTP support (on)])