summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSébastien Helleu <flashcode@flashtux.org>2015-05-17 08:48:54 +0200
committerSébastien Helleu <flashcode@flashtux.org>2015-05-17 08:48:54 +0200
commit1396e9b0ef72579803e00cf587f2f8c74a9bd473 (patch)
tree56eddc2d14a3b2010f38fcfabfc150b98201ab43
parent1fb3e8b2dcb2e5f59912fe0351f62193b843b388 (diff)
downloadweechat-1396e9b0ef72579803e00cf587f2f8c74a9bd473.zip
doc: replace PREFIX with CMAKE_INSTALL_PREFIX in cmake instructions (closes #354)
-rw-r--r--ChangeLog.asciidoc7
-rw-r--r--README.asciidoc2
-rw-r--r--doc/de/weechat_tester.de.asciidoc2
-rw-r--r--doc/de/weechat_user.de.asciidoc2
-rw-r--r--doc/en/weechat_tester.en.asciidoc2
-rw-r--r--doc/en/weechat_user.en.asciidoc2
-rw-r--r--doc/fr/weechat_tester.fr.asciidoc2
-rw-r--r--doc/fr/weechat_user.fr.asciidoc2
-rw-r--r--doc/it/weechat_tester.it.asciidoc2
-rw-r--r--doc/it/weechat_user.it.asciidoc2
-rw-r--r--doc/ja/weechat_tester.ja.asciidoc2
-rw-r--r--doc/ja/weechat_user.ja.asciidoc2
-rw-r--r--doc/pl/weechat_tester.pl.asciidoc2
-rw-r--r--doc/pl/weechat_user.pl.asciidoc2
-rw-r--r--weechat.cygport.in2
15 files changed, 21 insertions, 14 deletions
diff --git a/ChangeLog.asciidoc b/ChangeLog.asciidoc
index f881d40a7..22e7aa0bc 100644
--- a/ChangeLog.asciidoc
+++ b/ChangeLog.asciidoc
@@ -15,6 +15,13 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
(file 'ReleaseNotes.asciidoc' in sources).
+== Version 1.3 (under dev)
+
+=== Bugs fixed
+
+* doc: replace PREFIX with CMAKE_INSTALL_PREFIX in cmake instructions
+ (closes #354)
+
== Version 1.2 (2015-05-10)
=== New features
diff --git a/README.asciidoc b/README.asciidoc
index a7abc0916..4ea6b8ac7 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -64,7 +64,7 @@ Build with autotools requires more dependencies and is slower than with CMake.
----
$ mkdir build
$ cd build
-$ cmake .. -DPREFIX=/path/to/directory
+$ cmake .. -DCMAKE_INSTALL_PREFIX=/path/to/directory
$ make
$ make install (as root for installation in system directories)
----
diff --git a/doc/de/weechat_tester.de.asciidoc b/doc/de/weechat_tester.de.asciidoc
index 5c3ae87e1..5ccbc7212 100644
--- a/doc/de/weechat_tester.de.asciidoc
+++ b/doc/de/weechat_tester.de.asciidoc
@@ -99,7 +99,7 @@ Um die Quellen zu übersetzen, wird cmake empfohlen:
----
$ mkdir build
$ cd build
-$ cmake .. -DPREFIX=$HOME/weechat-git -DWEECHAT_HOME=~/.weechat-dev -DCMAKE_BUILD_TYPE=Debug
+$ cmake .. -DCMAKE_INSTALL_PREFIX=$HOME/weechat-git -DWEECHAT_HOME=~/.weechat-dev -DCMAKE_BUILD_TYPE=Debug
$ make
$ make install
----
diff --git a/doc/de/weechat_user.de.asciidoc b/doc/de/weechat_user.de.asciidoc
index ba4d60e81..0198ae77f 100644
--- a/doc/de/weechat_user.de.asciidoc
+++ b/doc/de/weechat_user.de.asciidoc
@@ -198,7 +198,7 @@ $ make
----
$ mkdir build
$ cd build
-$ cmake .. -DPREFIX=/Pfad/zum/Verzeichnis
+$ cmake .. -DCMAKE_INSTALL_PREFIX=/Pfad/zum/Verzeichnis
$ make
$ make install
----
diff --git a/doc/en/weechat_tester.en.asciidoc b/doc/en/weechat_tester.en.asciidoc
index 8078e14f5..4ea323301 100644
--- a/doc/en/weechat_tester.en.asciidoc
+++ b/doc/en/weechat_tester.en.asciidoc
@@ -87,7 +87,7 @@ To build sources, cmake is recommended:
----
$ mkdir build
$ cd build
-$ cmake .. -DPREFIX=$HOME/weechat-git -DWEECHAT_HOME=~/.weechat-dev -DCMAKE_BUILD_TYPE=Debug
+$ cmake .. -DCMAKE_INSTALL_PREFIX=$HOME/weechat-git -DWEECHAT_HOME=~/.weechat-dev -DCMAKE_BUILD_TYPE=Debug
$ make
$ make install
----
diff --git a/doc/en/weechat_user.en.asciidoc b/doc/en/weechat_user.en.asciidoc
index d19da6f21..d7492f324 100644
--- a/doc/en/weechat_user.en.asciidoc
+++ b/doc/en/weechat_user.en.asciidoc
@@ -187,7 +187,7 @@ $ make
----
$ mkdir build
$ cd build
-$ cmake .. -DPREFIX=/path/to/directory
+$ cmake .. -DCMAKE_INSTALL_PREFIX=/path/to/directory
$ make
$ make install
----
diff --git a/doc/fr/weechat_tester.fr.asciidoc b/doc/fr/weechat_tester.fr.asciidoc
index c035d1ce7..6c51cb220 100644
--- a/doc/fr/weechat_tester.fr.asciidoc
+++ b/doc/fr/weechat_tester.fr.asciidoc
@@ -91,7 +91,7 @@ Pour compiler les sources, cmake est recommandé :
----
$ mkdir build
$ cd build
-$ cmake .. -DPREFIX=$HOME/weechat-git -DWEECHAT_HOME=~/.weechat-dev -DCMAKE_BUILD_TYPE=Debug
+$ cmake .. -DCMAKE_INSTALL_PREFIX=$HOME/weechat-git -DWEECHAT_HOME=~/.weechat-dev -DCMAKE_BUILD_TYPE=Debug
$ make
$ make install
----
diff --git a/doc/fr/weechat_user.fr.asciidoc b/doc/fr/weechat_user.fr.asciidoc
index ccefbff6a..6725aceff 100644
--- a/doc/fr/weechat_user.fr.asciidoc
+++ b/doc/fr/weechat_user.fr.asciidoc
@@ -192,7 +192,7 @@ $ make
----
$ mkdir build
$ cd build
-$ cmake .. -DPREFIX=/chemin/vers/répertoire
+$ cmake .. -DCMAKE_INSTALL_PREFIX=/chemin/vers/répertoire
$ make
$ make install
----
diff --git a/doc/it/weechat_tester.it.asciidoc b/doc/it/weechat_tester.it.asciidoc
index 9ff723371..3387cd9fa 100644
--- a/doc/it/weechat_tester.it.asciidoc
+++ b/doc/it/weechat_tester.it.asciidoc
@@ -96,7 +96,7 @@ Per compilare i sorgenti, si raccomanda cmake:
----
$ mkdir build
$ cd build
-$ cmake .. -DPREFIX=$HOME/weechat-git -DWEECHAT_HOME=~/.weechat-dev -DCMAKE_BUILD_TYPE=Debug
+$ cmake .. -DCMAKE_INSTALL_PREFIX=$HOME/weechat-git -DWEECHAT_HOME=~/.weechat-dev -DCMAKE_BUILD_TYPE=Debug
$ make
$ make install
----
diff --git a/doc/it/weechat_user.it.asciidoc b/doc/it/weechat_user.it.asciidoc
index b1ca2eeae..670d4a2f7 100644
--- a/doc/it/weechat_user.it.asciidoc
+++ b/doc/it/weechat_user.it.asciidoc
@@ -210,7 +210,7 @@ $ make
----
$ mkdir build
$ cd build
-$ cmake .. -DPREFIX=/path/della/directory
+$ cmake .. -DCMAKE_INSTALL_PREFIX=/path/della/directory
$ make
$ make install
----
diff --git a/doc/ja/weechat_tester.ja.asciidoc b/doc/ja/weechat_tester.ja.asciidoc
index 5bbd85922..55122c2b3 100644
--- a/doc/ja/weechat_tester.ja.asciidoc
+++ b/doc/ja/weechat_tester.ja.asciidoc
@@ -92,7 +92,7 @@ $ cd weechat-devel
----
$ mkdir build
$ cd build
-$ cmake .. -DPREFIX=$HOME/weechat-git -DWEECHAT_HOME=~/.weechat-dev -DCMAKE_BUILD_TYPE=Debug
+$ cmake .. -DCMAKE_INSTALL_PREFIX=$HOME/weechat-git -DWEECHAT_HOME=~/.weechat-dev -DCMAKE_BUILD_TYPE=Debug
$ make
$ make install
----
diff --git a/doc/ja/weechat_user.ja.asciidoc b/doc/ja/weechat_user.ja.asciidoc
index 9726417b5..f534a37e4 100644
--- a/doc/ja/weechat_user.ja.asciidoc
+++ b/doc/ja/weechat_user.ja.asciidoc
@@ -192,7 +192,7 @@ $ make
----
$ mkdir build
$ cd build
-$ cmake .. -DPREFIX=/path/to/directory
+$ cmake .. -DCMAKE_INSTALL_PREFIX=/path/to/directory
$ make
$ make install
----
diff --git a/doc/pl/weechat_tester.pl.asciidoc b/doc/pl/weechat_tester.pl.asciidoc
index cdbe668c8..0a4b5de88 100644
--- a/doc/pl/weechat_tester.pl.asciidoc
+++ b/doc/pl/weechat_tester.pl.asciidoc
@@ -92,7 +92,7 @@ Do zbudowania źródeł zaleca się cmake:
----
$ mkdir build
$ cd build
-$ cmake .. -DPREFIX=$HOME/weechat-git -DWEECHAT_HOME=~/.weechat-dev -DCMAKE_BUILD_TYPE=Debug
+$ cmake .. -DCMAKE_INSTALL_PREFIX=$HOME/weechat-git -DWEECHAT_HOME=~/.weechat-dev -DCMAKE_BUILD_TYPE=Debug
$ make
$ make install
----
diff --git a/doc/pl/weechat_user.pl.asciidoc b/doc/pl/weechat_user.pl.asciidoc
index 246e21c2d..fdf015daa 100644
--- a/doc/pl/weechat_user.pl.asciidoc
+++ b/doc/pl/weechat_user.pl.asciidoc
@@ -194,7 +194,7 @@ $ make
----
$ mkdir build
$ cd build
-$ cmake .. -DPREFIX=/ścieżka/do/katalogu
+$ cmake .. -DCMAKE_INSTALL_PREFIX=/ścieżka/do/katalogu
$ make
$ make install
----
diff --git a/weechat.cygport.in b/weechat.cygport.in
index 0bdcdf6a7..5b2b3c917 100644
--- a/weechat.cygport.in
+++ b/weechat.cygport.in
@@ -58,7 +58,7 @@ lua perl pkg-config python ruby source-highlight tcl zlib-devel"
# which is not yet available in Cygwin
# 4. disable Javascript plugin because libv8 is not available in Cygwin
#
-CYGCMAKE_ARGS="-DPREFIX=/usr -DENABLE_MAN=ON -DENABLE_DOC=ON \
+CYGCMAKE_ARGS="-DCMAKE_INSTALL_PREFIX=/usr -DENABLE_MAN=ON -DENABLE_DOC=ON \
-DENABLE_GUILE=OFF -DENABLE_JAVASCRIPT=OFF"
#