Skip to content

Commit 51cd085

Browse files
committed
README: Distinguish source tarball vs git deps
autoconf/automake/libtool are only needed if building from git, as the dist tarball is not depending on autotools. The reference to GNU Autotools has been moved under "Building from Git", since this detail is interesting only for those who clone the project.
1 parent f2bc1b5 commit 51cd085

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

README

+15-15
Original file line numberDiff line numberDiff line change
@@ -52,27 +52,25 @@ $ brew install pam-u2f
5252
[[building]]
5353
== Building from a source tarball
5454

55-
This project uses 'autoconf', 'automake', 'pkg-config' and 'libtool'
56-
to achieve portability and ease of use.
55+
This project depends on https://developers.yubico.com/libfido2[`libfido2`]
56+
(>= 1.3.0).
57+
Versions of this project up to 1.0.8 used `libu2f-host` and
58+
`libu2f-server`.
5759

58-
In addition, https://developers.yubico.com/libfido2['libfido2'] (>=
59-
1.3.0) is needed. Versions of this project up to 1.0.8 used
60-
`libu2f-host` and `libu2f-server`. On Ubuntu, the necessary dependencies can be
61-
installed using
60+
On Ubuntu, the dependencies needed to build the source tarball can be installed
61+
using:
6262

6363
[source]
6464
----
6565
# apt install --no-install-recommends \
66-
autoconf \
67-
automake \
6866
libfido2-dev \
6967
libpam-dev \
7068
libssl-dev \
71-
libtool \
72-
pkg-config
69+
pkg-config \
70+
;
7371
----
7472

75-
If you downloaded a tarball, build it as follows.
73+
The project can be built as follows:
7674

7775
[source]
7876
----
@@ -103,9 +101,11 @@ This will create a directory 'pam-u2f'. Enter the directory:
103101
$ cd pam-u2f
104102
----
105103

106-
`autoconf`, `automake`, `libtool`, and `libpam` must be installed.
107-
`AsciiDoc` and `xsltproc` are used to generate the manpages. On Ubuntu,
108-
the necessary dependencies can be installed using
104+
This project uses `autoconf`, `automake`, `pkg-config` and `libtool`
105+
to achieve portability and ease of use.
106+
`AsciiDoc` and `xsltproc` are used to generate the manpages.
107+
108+
On Ubuntu, the dependencies needed to build from Git can be installed using:
109109

110110
[source]
111111
----
@@ -123,7 +123,7 @@ the necessary dependencies can be installed using
123123
xsltproc
124124
----
125125

126-
On Fedora, the necessary dependencies can be installed using
126+
On Fedora, the necessary dependencies can be installed using:
127127

128128
[source]
129129
----

0 commit comments

Comments
 (0)