diff --git a/configure.ac b/configure.ac index f94a2784..6dfde305 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ AS_CASE([$host_os], [cygwin], [PLATFORM="cygwin"], [PLATFORM="nix"]) -PACKAGE_STATUS="development" +PACKAGE_STATUS="release" ### Get git branch and revision if in development if test "x$PACKAGE_STATUS" = xdevelopment; then diff --git a/install-all.sh b/install-all.sh index cc32d8fd..7970804b 100755 --- a/install-all.sh +++ b/install-all.sh @@ -74,6 +74,7 @@ install_lib_strophe() echo git clone git://github.com/strophe/libstrophe.git cd libstrophe + git checkout 0.8.7 ./bootstrap.sh ./configure --prefix=$1 make @@ -102,6 +103,7 @@ cyg_install_lib_strophe() echo git clone git://github.com/strophe/libstrophe.git cd libstrophe + git checkout 0.8.7 ./bootstrap.sh ./bootstrap.sh # second call seems to fix problem on cygwin ./configure --prefix=/usr diff --git a/upgrade.sh b/upgrade.sh deleted file mode 100755 index e2ed3d3b..00000000 --- a/upgrade.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/sh - -linux_upgrade() -{ - echo - echo Profanity installer... upgrading Profanity - echo - ./bootstrap.sh - ./configure - make clean - make - sudo make install - echo - echo Profanity installer... upgrade complete! - echo - echo Type \'profanity\' to run. - echo -} - -cygwin_upgrade() -{ - echo - echo Profanity installer... upgrading Profanity - echo - export LIBRARY_PATH=/usr/local/lib - ./bootstrap.sh - ./configure - make clean - make - make install - echo - echo Profanity installer... upgrade complete! - echo - echo Type \'profanity\' to run. - echo -} - -OS=`uname -s` -SYSTEM=unknown - -if [ "${OS}" = "Linux" ]; then - SYSTEM=linux -else - echo $OS | grep -i cygwin - if [ "$?" -eq 0 ]; then - SYSTEM=cygwin - fi -fi - -case "$SYSTEM" in -unknown) echo The upgrade script will not work on this OS. - echo Try a manual upgrade instead. - exit - ;; -linux) linux_upgrade - ;; -cygwin) cygwin_upgrade - ;; -esac -