[libxml2] Remove outdated xml2Conf.sh
- From: Nick Wellnhofer <nwellnhof src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libxml2] Remove outdated xml2Conf.sh
- Date: Sun, 3 Apr 2022 17:34:01 +0000 (UTC)
commit 4b10e7cf7f4a78fc03d0bbb599dab2b7888d8cfd
Author: Nick Wellnhofer <wellnhofer aevum de>
Date: Sun Apr 3 18:44:37 2022 +0200
Remove outdated xml2Conf.sh
.gitignore | 1 -
CMakeLists.txt | 2 --
Makefile.am | 22 ++--------------------
xml2Conf.sh.in | 8 --------
4 files changed, 2 insertions(+), 31 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 94d0593a..19c0403a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -118,7 +118,6 @@ tmp
tst.c
tst
xml2-config
-xml2Conf.sh
xmlcatalog
xmlconf
xmllint
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a9104ffe..161f2ca7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -674,8 +674,6 @@ install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/xml2-config DESTINATION ${CMAKE_INS
set(XML_INCLUDEDIR "-I${CMAKE_INSTALL_FULL_INCLUDEDIR}/libxml2")
set(XML_LIBDIR "-L${CMAKE_INSTALL_FULL_LIBDIR}")
-configure_file(xml2Conf.sh.in xml2Conf.sh @ONLY)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/xml2Conf.sh DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT
development)
set(CPACK_COMPONENT_DEVELOPMENT_DEPENDS runtime)
set(CPACK_COMPONENT_PROGRAMS_DEPENDS runtime)
diff --git a/Makefile.am b/Makefile.am
index 922938b3..3eb2505e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1222,28 +1222,10 @@ cleantar:
rpm: cleanup cleantar
@(unset CDPATH ; $(MAKE) dist-source dist && rpmbuild -ta $(distdir).tar.gz)
-## We create xml2Conf.sh here and not from configure because we want
-## to get the paths expanded correctly. Macros like srcdir are given
-## the value NONE in configure if the user doesn't specify them (this
-## is an autoconf feature, not a bug).
-
-xml2Conf.sh: xml2Conf.sh.in Makefile
-## Use sed and then mv to avoid problems if the user interrupts.
- sed -e 's?\@XML_LIBDIR\@?$(XML_LIBDIR)?g' \
- -e 's?\@XML_INCLUDEDIR\@?$(XML_INCLUDEDIR)?g' \
- -e 's?\@VERSION\@?$(VERSION)?g' \
- -e 's?\@XML_LIBS\@?$(XML_LIBS)?g' \
- -e 's?\@XML_PRIVATE_LIBS\@?$(XML_PRIVATE_LIBS)?g' \
- -e 's?\@LIBS\@?$(LIBS)?g' \
- < $(srcdir)/xml2Conf.sh.in > xml2Conf.tmp \
- && mv xml2Conf.tmp xml2Conf.sh
-
-CLEANFILES = runxmlconf.log test.out xml2Conf.sh *.gcda *.gcno *.res
+CLEANFILES = runxmlconf.log test.out *.gcda *.gcno *.res
DISTCLEANFILES = COPYING missing.lst
-confexecdir=$(libdir)
-confexec_DATA = xml2Conf.sh
-EXTRA_DIST = xml2-config.in xml2Conf.sh.in libxml.spec.in libxml2.spec \
+EXTRA_DIST = xml2-config.in libxml.spec.in libxml2.spec \
libxml.m4 Copyright check-xml-test-suite.py gentest.py \
check-relaxng-test-suite.py check-relaxng-test-suite2.py \
check-xsddata-test-suite.py check-xinclude-test-suite.py \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]