docs: Don't overcomplicate things with the major version in docs

Just hard code '1' instead of using variable substitution.

https://bugzilla.gnome.org/show_bug.cgi?id=751400
This commit is contained in:
Stef Walter 2015-06-29 14:39:33 +02:00
parent 5f6126da7b
commit 4c08fe2933
3 changed files with 5 additions and 8 deletions

View File

@ -275,7 +275,6 @@ AC_CONFIG_FILES([
Makefile
docs/reference/libsecret/Makefile
docs/reference/libsecret/version.xml
docs/reference/libsecret/version-major.xml
po/Makefile.in
po/Makefile
libsecret/libsecret.pc

View File

@ -97,8 +97,7 @@ include $(top_srcdir)/gtk-doc.make
# Other files to distribute
# e.g. EXTRA_DIST += version.xml.in
EXTRA_DIST += \
version.xml.in \
version-major.xml.in
version.xml.in
# Files not to distribute
# for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types

View File

@ -1,7 +1,6 @@
<?xml version="1.0"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
<!ENTITY major SYSTEM "version-major.xml">
]>
<part id="using">
<title>Using libsecret in builds or scripts</title>
@ -11,11 +10,11 @@
<para>Like other GNOME libraries, <application>libsecret</application> uses
<application>pkg-config</application> to provide compiler options. The package
name is "<literal>libsecret-&major;</literal>". So in your
name is "<literal>libsecret-1</literal>". So in your
<literal>configure.ac</literal> script,you might specify something like:</para>
<informalexample><programlisting>
PKG_CHECK_MODULES(LIBSECRET, [libsecret-&major; >= 1.0])
PKG_CHECK_MODULES(LIBSECRET, [libsecret-1 >= 1.0])
AC_SUBST(LIBSECRET_CFLAGS)
AC_SUBST(LIBSECRET_LIBS)
</programlisting></informalexample>
@ -88,13 +87,13 @@ schema = Secret.Schema.new("org.mock.Schema",
<title>Vala: Compiling with libsecret</title>
<para>
The package name is "<literal>libsecret-&major;</literal>". You can use it like
The package name is "<literal>libsecret-1</literal>". You can use it like
this in your <literal>Makefile.am</literal> file:
</para>
<informalexample><programlisting>
AM_VALAFLAGS = \
--pkg=libsecret-&major;
--pkg=libsecret-1
</programlisting></informalexample>
<para>