1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
|
--- Makefile.in.orig Sat Nov 25 04:00:19 2000
+++ Makefile.in Wed Nov 29 17:37:37 2000
@@ -121,8 +121,8 @@
-bin_SCRIPTS = xml-config
+bin_SCRIPTS = xml2-config
-lib_LTLIBRARIES = libxml.la
+lib_LTLIBRARIES = libxml2.la
libxml_la_LIBADD = @Z_LIBS@
-libxml_la_LDFLAGS = -version-info @LIBXML_VERSION_INFO@
+libxml_la_LDFLAGS = -version-info 5:0:0
@@ -131,6 +131,6 @@
-DEPS = $(top_builddir)/libxml.la
-LDADDS = $(top_builddir)/libxml.la @Z_LIBS@ @M_LIBS@
+DEPS = $(top_builddir)/libxml2.la
+LDADDS = $(top_builddir)/libxml2.la @Z_LIBS@ @M_LIBS@
-man_MANS = xmllint.1 xml-config.1 libxml.4
+man_MANS = xmllint.1 xml2-config.1 libxml.4
@@ -164,6 +164,6 @@
-confexecdir = $(libdir)
-confexec_DATA = xmlConf.sh
+confexecdir = $(sysconfdir)
+confexec_DATA = xml2Conf.sh
-CLEANFILES = xmlConf.sh
+CLEANFILES = xml2Conf.sh
EXTRA_DIST = xmlConf.sh.in libxml.spec.in libxml.spec libxml.m4 example/Makefile.am example/gjobread.c example/gjobs.xml $(man_MANS) libxml-2.0.pc.in xmlversion.h.in win32/README.MSDev win32/Makefile.mingw win32/libxml2/libxml2.dsp
@@ -207,3 +207,3 @@
NROFF = nroff
-DATA = $(confexec_DATA) $(m4data_DATA) $(pkgconfig_DATA)
+DATA = $(confexec_DATA) $(m4data_DATA)
@@ -273,2 +273,6 @@
cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+xml2-config: xml-config
+ cd $(top_builddir) && cp xml-config xml2-config
+xml2-config.1: xml-config.1
+ cd $(top_builddir) && cp xml-config.1 xml2-config.1
@@ -337,3 +341,3 @@
-libxml.la: $(libxml_la_OBJECTS) $(libxml_la_DEPENDENCIES)
+libxml2.la: $(libxml_la_OBJECTS) $(libxml_la_DEPENDENCIES)
$(LINK) -rpath $(libdir) $(libxml_la_LDFLAGS) $(libxml_la_OBJECTS) $(libxml_la_LIBADD) $(LIBS)
@@ -827,3 +831,3 @@
-install-data-am: install-man install-m4dataDATA install-pkgconfigDATA
+install-data-am: install-man install-m4dataDATA
install-data: install-data-recursive
@@ -838,3 +842,3 @@
uninstall: uninstall-recursive
-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) \
+all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(MANS) $(DATA) \
config.h
@@ -848,3 +852,3 @@
$(DESTDIR)$(mandir)/man4 $(DESTDIR)$(confexecdir) \
- $(DESTDIR)$(m4datadir) $(DESTDIR)$(pkgconfigdir)
+ $(DESTDIR)$(m4datadir)
@@ -1219,3 +1223,3 @@
-xmlConf.sh: xmlConf.sh.in Makefile
+xml2Conf.sh: xmlConf.sh.in Makefile
sed -e 's?\@XML_LIBDIR\@?$(XML_LIBDIR)?g' \
@@ -1225,3 +1229,3 @@
< $(srcdir)/xmlConf.sh.in > xmlConf.tmp \
- && mv xmlConf.tmp xmlConf.sh
+ && mv xmlConf.tmp xml2Conf.sh
|
