Merge pull request #692 from gracjan/pr-use-texinfo-from-ppa

Use texinfo build from ppa

Author: gracjan

.travis.yml

@@ -5,14 +5,14 @@ env:
     - EMACS=emacs23           TARGET=check
     - EMACS=emacs24           TARGET=check
     - EMACS=emacs-snapshot    TARGET=check
-    - EMACS=emacs24           TARGET=deploy-manual
+    - TARGET=deploy-manual
   global:
     - secure: "ejv1+ub/v+Hm/23fhp4zLAHT3HiCG+YdDHai57LDe4LfEZCeGz4i/6LazbPbwm58v2YuKvMcdNshebc1s4A293ARJryPyFfW/8kEe+3hQ+cDxunNdHfqcS8SyhcDG0mrv7dqiVAtMJqB8qZb0c161KeEM8nyhC0wyQ+EZ5qJnzM="
 
 matrix:
   allow_failures:
     - env:
-        - EMACS=emacs-snapshot
+        - EMACS=emacs-snapshot    TARGET=check
 
 install:
   - if [ "$EMACS" = "emacs23" ]; then
@@ -27,21 +27,16 @@ install:
   - if [ "$EMACS" = "emacs-snapshot" ]; then
         sudo add-apt-repository -y ppa:ubuntu-elisp/ppa &&
         sudo apt-get update -qq &&
-        sudo apt-get install -qq emacs-snapshot &&
-        sudo apt-get install -qq emacs-snapshot-el;
+        sudo apt-get install -qq emacs-snapshot emacs-snapshot-el;
     fi
   - if [ "$TARGET" = "deploy-manual" ]; then
-        curl -O http://ftp.gnu.org/gnu/texinfo/texinfo-5.2.tar.xz;
-        tar -xf texinfo-5.2.tar.xz;
-        cd texinfo-5.2;
-        ./configure;
-        make;
-        sudo make install;
-        cd ..;
+        sudo add-apt-repository -y ppa:gracjanpolak/ppa &&
+        sudo apt-get update -qq &&
+        sudo apt-get install -qq texinfo;
     fi
 
 script:
-  lsb_release -a && $EMACS --version && make EMACS=$EMACS $TARGET
+  make $TARGET
 
 notifications:
   email: false