diff options
| -rw-r--r-- | appendixa/automake-dep.xml | 2 | ||||
| -rw-r--r-- | appendixa/automake-desc.xml | 20 | ||||
| -rw-r--r-- | appendixa/automake-shortdesc.xml | 13 | ||||
| -rw-r--r-- | appendixa/automake.xml | 1 | ||||
| -rw-r--r-- | chapter06/automake-inst.xml | 17 | ||||
| -rw-r--r-- | chapter06/automake.xml | 4 | ||||
| -rw-r--r-- | entities/automake.ent | 1 |
7 files changed, 41 insertions, 17 deletions
diff --git a/appendixa/automake-dep.xml b/appendixa/automake-dep.xml index f841e3957..a6f9e23f4 100644 --- a/appendixa/automake-dep.xml +++ b/appendixa/automake-dep.xml @@ -1,3 +1,5 @@ +<sect2><title> </title><para> </para></sect2> + <sect2> <title>Automake Installation Dependencies</title> diff --git a/appendixa/automake-desc.xml b/appendixa/automake-desc.xml index 7879172a4..68cae424e 100644 --- a/appendixa/automake-desc.xml +++ b/appendixa/automake-desc.xml @@ -1,13 +1,10 @@ -<sect2><title>Contents of Automake</title> +<sect2><title> </title><para> </para></sect2> -<para>Last checked against version &automake-contversion;.</para> +<sect2><title>Descriptions</title> -<sect3><title>Program Files</title> -<para>acinstall, aclocal, aclocal-1.6, automake, automake-1.6, -compile, config.guess, config.sub, depcomp, elisp-comp, install-sh, -mdate-sh, missing, mkinstalldirs, py-compile, ylwrap</para></sect3> +<para>Last checked against version &automake-contversion;.</para> -<sect3><title>Descriptions</title> +<sect3><title>Program file descriptions</title> <sect4><title>acinstall</title> <para>acinstall is a script which installs aclocal-style M4 files.</para></sect4> @@ -25,10 +22,11 @@ Also, the aclocal mechanism is extensible for use by other packages.</para></sect4> <sect4><title>automake, automake-1.6</title> -<para>To create all the Makefile.in's for a package, run the automake -program in the top level directory, with no arguments. automake will -automatically find each appropriate Makefile.am (by scanning -configure.in) and generate the corresponding Makefile.in.</para></sect4> +<para>To create all the Makefile.in files for a package, run the +automake program in the top level directory, with no +arguments. automake will automatically find each appropriate +Makefile.am (by scanning configure.in) and generate the corresponding +Makefile.in.</para></sect4> <sect4><title>compile</title> <para>compile is script which acts as a wrapper for compilers.</para></sect4> diff --git a/appendixa/automake-shortdesc.xml b/appendixa/automake-shortdesc.xml new file mode 100644 index 000000000..13093b4b1 --- /dev/null +++ b/appendixa/automake-shortdesc.xml @@ -0,0 +1,13 @@ +<sect2><title>Contents of Automake</title> + +<para>Last checked against version &automake-contversion;.</para> + +<para>Automake generates Makefile.in files, intended for use with Autoconf.</para> +<para>Modutils installs the following:</para> + +<sect3><title>Program Files</title> +<para>acinstall, aclocal, aclocal-1.6, automake, automake-1.6, +compile, config.guess, config.sub, depcomp, elisp-comp, install-sh, +mdate-sh, missing, mkinstalldirs, py-compile, ylwrap</para></sect3> + +</sect2> diff --git a/appendixa/automake.xml b/appendixa/automake.xml index 872e6a0b9..7f80159c5 100644 --- a/appendixa/automake.xml +++ b/appendixa/automake.xml @@ -3,6 +3,7 @@ <?dbhtml filename="automake.html" dir="appendixa"?> &aa-automake-down; +&aa-automake-shortdesc; &aa-automake-desc; &aa-automake-dep; diff --git a/chapter06/automake-inst.xml b/chapter06/automake-inst.xml index ec7f8e296..b1535bd02 100644 --- a/chapter06/automake-inst.xml +++ b/chapter06/automake-inst.xml @@ -1,11 +1,20 @@ +<sect2><title> </title><para> </para></sect2> + <sect2> <title>Installation of Automake</title> -<para>Install Automake by running the following commands:</para> +<para>Prepare Automake to be compiled:</para> + +<para><screen><userinput> +./configure --prefix=/usr</userinput></screen></para> + +<para>Continue with compiling and installing the package:</para> -<para><screen><userinput>./configure --prefix=/usr && -make install && +<para><screen><userinput>make install</userinput></screen></para> + +<para>Create necessary symbolic link:</para> + +<para><screen><userinput> ln -s automake-1.7 /usr/share/automake</userinput></screen></para> </sect2> - diff --git a/chapter06/automake.xml b/chapter06/automake.xml index 54292a02e..fb821c3b0 100644 --- a/chapter06/automake.xml +++ b/chapter06/automake.xml @@ -5,8 +5,8 @@ <screen>Estimated build time: &automake-time; Estimated required disk space: &automake-compsize;</screen> -&c6-automake-inst; -&aa-automake-desc; +&aa-automake-shortdesc; &aa-automake-dep; +&c6-automake-inst; </sect1> diff --git a/entities/automake.ent b/entities/automake.ent index d7f98e829..aff0e6f35 100644 --- a/entities/automake.ent +++ b/entities/automake.ent @@ -4,6 +4,7 @@ <!ENTITY c6-automake-inst SYSTEM "../chapter06/automake-inst.xml"> <!ENTITY aa-automake SYSTEM "../appendixa/automake.xml"> +<!ENTITY aa-automake-shortdesc SYSTEM "../appendixa/automake-shortdesc.xml"> <!ENTITY aa-automake-desc SYSTEM "../appendixa/automake-desc.xml"> <!ENTITY aa-automake-dep SYSTEM "../appendixa/automake-dep.xml"> <!ENTITY aa-automake-down SYSTEM "../appendixa/automake-down.xml"> |