From: Ferenc Kovacs <tyrael@php.net>
Date: Tue, 10 Feb 2015 09:36:45 +0000 (+0100)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHP7_EREG_MYSQL_REMOVALS~208
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f4880774b6a47bb3b71f67fd791a117131438d0a;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  add make install
---

f4880774b6a47bb3b71f67fd791a117131438d0a
diff --cc travis/compile.sh
index 2a78beeea5,218f4b9f28..3603c9b0a8
--- a/travis/compile.sh
+++ b/travis/compile.sh
@@@ -53,13 -52,10 +53,14 @@@ $TS 
  --enable-calendar \
  --enable-ftp \
  --with-pspell=/usr \
 ---with-recode=/usr \
  --with-enchant=/usr \
  --enable-wddx \
 +--with-imap \
 +--with-imap-ssl \
 +--with-freetype-dir=/usr \
 +--with-t1lib=/usr \
 +--with-xpm-dir=/usr \
 +--with-kerberos \
  --enable-sysvmsg 
- make --quiet
+ make -j2 --quiet
+ make install