aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@frugalware.org>2008-08-15 18:08:53 +0200
committerMiklos Vajna <vmiklos@frugalware.org>2008-08-15 18:08:53 +0200
commit1f59f2f7eaefc001b8c30eff12a8c52b94c9b113 (patch)
tree750aa5eb854d45e67d71d0d9dbbc78c57d4b60d1
parent446c6fffaf80d86b6c756c728adb0d5fb5b40110 (diff)
fix bitlbee compile instructions
-rw-r--r--skype/Makefile3
-rw-r--r--skype/README12
2 files changed, 8 insertions, 7 deletions
diff --git a/skype/Makefile b/skype/Makefile
index c1f7cf8b..53217343 100644
--- a/skype/Makefile
+++ b/skype/Makefile
@@ -1,6 +1,8 @@
-include config.mak
VERSION = 0.6.0
+# oldest supported one
+BITLBEE_VERSION = 1.2.1
AMVERSION = $(shell automake --version|sed 's/.* //;s/\([0-9]\+\.[0-9]\+\)\.[0-9]\+/\1/;q')
@@ -53,6 +55,7 @@ doc: HEADER.html Changelog
HEADER.html: README Makefile
asciidoc -a toc -a numbered -a sectids -o HEADER.html README
sed -i 's|@VERSION@|$(VERSION)|g' HEADER.html
+ sed -i 's|@BITLBEE_VERSION@|$(BITLBEE_VERSION)|g' HEADER.html
Changelog: .git/refs/heads/master
git log --no-merges |git name-rev --tags --stdin >Changelog
diff --git a/skype/README b/skype/README
index 67f6bbff..c55d2334 100644
--- a/skype/README
+++ b/skype/README
@@ -29,8 +29,8 @@ not..)
== Requirements
* Skype >= 1.4.0.99. The latest version I've tested is 2.0.0.72.
-* BitlBee >= 1.2.1. Use old versions (<=0.5.1) if you have 1.2 or
- 1.1.1dev installed.
+* BitlBee >= @BITLBEE_VERSION@. Use old versions (0.5.1 or earlier) if
+ you have older BitlBee installed.
* Skype4Py >= 0.9.28.7. Previous versions won't work due to API changes.
NOTE: 1.x just does not work for me. I mailed the author but did not
@@ -83,13 +83,11 @@ and you have to install `bitlbee-skype` and `skype4py` from source.
- You need the latest stable BitlBee release:
----
-$ wget http://get.bitlbee.org/src/bitlbee-1.2.tar.gz
-$ tar xf bitlbee-1.2.tar.gz
-$ cd bitlbee-1.2
+$ wget http://get.bitlbee.org/src/bitlbee-@BITLBEE_VERSION@.tar.gz
+$ tar xf bitlbee-@BITLBEE_VERSION@.tar.gz
+$ cd bitlbee-@BITLBEE_VERSION@
----
-NOTE: You no longer need additional patches, as of version 1.1.1dev.
-
- Now compile and install it:
----