Travis: directory paths need fixing

.travis.yml

@@ -38,9 +38,7 @@ install:
              --enable-experimental --enable-module-{ecdh,recovery}                \
       && make -j$(nproc) && sudo make install && cd ..
   - |
-      cd secp256k1 && phpize                                                      \
-      && ./configure && make -j$(nproc) && sudo make install                      \
-      && cd ..
+          phpize && ./configure && make && sudo make install
   - composer update
 
 before_script:

secp256k1.c

@@ -9,7 +9,11 @@
 #include "php_ini.h"
 #include "ext/standard/info.h"
 #include "php_secp256k1.h"
+#if defined(HAVE_LIBSECP256K1)
 #include "lax_der.h"
+#else
+#include "secp256k1/contrib/lax_der.h"
+#endif
 #include "zend_exceptions.h"
 
 static zend_class_entry *spl_ce_InvalidArgumentException;

travis/phpqa/README.md

@@ -8,4 +8,4 @@ review for being able to just pull upstream and work with their images.
 # Starting a container
 
 docker build -it secp256k1build .
-docker run -it -v /path/to/output:/usr/src/php/lcov_html -v /path/to/secp256k1-php/secp256k1:/usr/src/php/ext/secp256k1 --name s1 secp256k1build
+docker run -it -v /path/to/output:/usr/src/php/lcov_html -v /path/to/secp256k1-php:/usr/src/php/ext/secp256k1 --name s1 secp256k1build

travis/phpqa/container_command.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 _PHPQA_DIR=$(git rev-parse --show-toplevel)/travis/phpqa
 _GCOV_DIR=${_PHPQA_DIR}/output
-_EXT_DIR=$(git rev-parse --show-toplevel)/secp256k1
+_EXT_DIR=$(git rev-parse --show-toplevel)
 _CMD=$1
 
 rm -rf ${_GCOV_DIR}

travis/run_coverage_test.sh

@@ -2,7 +2,7 @@
 
 exitHard=false
 if [ "${COVERAGE}" = "true" ]; then
-    cd $(git rev-parse --show-toplevel)/secp256k1
+    cd $(git rev-parse --show-toplevel)/
     sudo make clean
     cd $(git rev-parse --show-toplevel)/travis/phpqa
     ./container_command.sh coverage.sh