diff options
author | Christian Grothoff <christian@grothoff.org> | 2019-08-20 16:42:04 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2019-08-20 16:42:04 +0200 |
commit | 84bf4965df641d87940715bb3b3a2517e9cc1ae6 (patch) | |
tree | ae925cb0357f381ac706bd467ec2524e5ebf3afa /template | |
parent | 928e28f2de938ea7007b87e95c2c29576ed03d82 (diff) | |
parent | 131a0636b7066a8b8b85938c47ceac9e720bb630 (diff) | |
download | www-84bf4965df641d87940715bb3b3a2517e9cc1ae6.tar.gz www-84bf4965df641d87940715bb3b3a2517e9cc1ae6.zip |
Merge branch 'master' into stable
Diffstat (limited to 'template')
-rw-r--r-- | template/install-on-archpi.html.j2 | 2 | ||||
-rw-r--r-- | template/install-on-debian9.html.j2 | 2 | ||||
-rw-r--r-- | template/install-on-ubuntu1804.html.j2 | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/template/install-on-archpi.html.j2 b/template/install-on-archpi.html.j2 index 1ef61eb2..dd205da9 100644 --- a/template/install-on-archpi.html.j2 +++ b/template/install-on-archpi.html.j2 | |||
@@ -50,7 +50,7 @@ | |||
50 | 50 | ||
51 | <p><code> | 51 | <p><code> |
52 | > cd gnunet<br> | 52 | > cd gnunet<br> |
53 | > export GNUNET_PREFIX=/usr # for example, other locations possible | 53 | > export GNUNET_PREFIX=/usr # for example, other locations possible<br> |
54 | > ./bootstrap # Run this to generate the configure files.<br> | 54 | > ./bootstrap # Run this to generate the configure files.<br> |
55 | > ./configure --prefix=$GNUNET_PREFIX --disable-documentation # Use --help to see the various flags available to you.<br> | 55 | > ./configure --prefix=$GNUNET_PREFIX --disable-documentation # Use --help to see the various flags available to you.<br> |
56 | > make -j$(nproc || echo -n 1)<br> | 56 | > make -j$(nproc || echo -n 1)<br> |
diff --git a/template/install-on-debian9.html.j2 b/template/install-on-debian9.html.j2 index 7655051e..63e2a3f8 100644 --- a/template/install-on-debian9.html.j2 +++ b/template/install-on-debian9.html.j2 | |||
@@ -105,7 +105,7 @@ | |||
105 | <code> | 105 | <code> |
106 | $ cd ~/gnunet_installation/gnunet<br> | 106 | $ cd ~/gnunet_installation/gnunet<br> |
107 | $ ./bootstrap<br> | 107 | $ ./bootstrap<br> |
108 | $ export GNUNET_PREFIX=/usr/local # for example, other locations possible | 108 | $ export GNUNET_PREFIX=/usr/local # for example, other locations possible<br> |
109 | $ ./configure --prefix=$GNUNET_PREFIX --disable-documentation --with-microhttpd=/opt/libmicrohttpd<br> | 109 | $ ./configure --prefix=$GNUNET_PREFIX --disable-documentation --with-microhttpd=/opt/libmicrohttpd<br> |
110 | $ sudo addgroup gnunet<br> | 110 | $ sudo addgroup gnunet<br> |
111 | $ sudo usermod -aG gnunet $USER<br> | 111 | $ sudo usermod -aG gnunet $USER<br> |
diff --git a/template/install-on-ubuntu1804.html.j2 b/template/install-on-ubuntu1804.html.j2 index 157183d8..199bd1ed 100644 --- a/template/install-on-ubuntu1804.html.j2 +++ b/template/install-on-ubuntu1804.html.j2 | |||
@@ -74,7 +74,7 @@ | |||
74 | $ ./configure --prefix=$GNUNET_PREFIX --disable-documentation --with-microhttpd=/opt/libmicrohttpd<br> | 74 | $ ./configure --prefix=$GNUNET_PREFIX --disable-documentation --with-microhttpd=/opt/libmicrohttpd<br> |
75 | $ sudo addgroup gnunetdns<br> | 75 | $ sudo addgroup gnunetdns<br> |
76 | $ sudo adduser --system --group --disabled-login --home /var/lib/gnunet gnunet<br> | 76 | $ sudo adduser --system --group --disabled-login --home /var/lib/gnunet gnunet<br> |
77 | $ sudo usermod -aG gnunet $USER | 77 | $ sudo usermod -aG gnunet $USER<br> |
78 | $ make -j$(nproc || echo -n 1)<br> | 78 | $ make -j$(nproc || echo -n 1)<br> |
79 | $ sudo make install | 79 | $ sudo make install |
80 | </code> | 80 | </code> |
@@ -83,11 +83,11 @@ | |||
83 | <code> | 83 | <code> |
84 | $ cd ~/gnunet_installation/gnunet<br> | 84 | $ cd ~/gnunet_installation/gnunet<br> |
85 | $ ./bootstrap<br> | 85 | $ ./bootstrap<br> |
86 | $ export GNUNET_PREFIX=/usr/local # for example, other locations possible | 86 | $ export GNUNET_PREFIX=/usr/local # for example, other locations possible<br> |
87 | $ export CFLAGS="-g -Wall -O0"<br> | 87 | $ export CFLAGS="-g -Wall -O0"<br> |
88 | $ ./configure --prefix=$GNUNET_PREFIX --disable-documentation --enable-logging=verbose <br> | 88 | $ ./configure --prefix=$GNUNET_PREFIX --disable-documentation --enable-logging=verbose <br> |
89 | $ sudo addgroup gnunet<br> | 89 | $ sudo addgroup gnunet<br> |
90 | $ sudo usermod -aG gnunet $USER | 90 | $ sudo usermod -aG gnunet $USER<br> |
91 | $ make -j$(nproc || echo -n 1)<br> | 91 | $ make -j$(nproc || echo -n 1)<br> |
92 | $ sudo make install | 92 | $ sudo make install |
93 | </code> | 93 | </code> |