From 39cbbc1ae489aadbadc1bc376e3c85f4ba70f1ed Mon Sep 17 00:00:00 2001
From: Karl Palmskog <palmskog@gmail.com>
Date: Thu, 12 Jan 2017 21:08:59 -0600
Subject: [PATCH] opam installation fixes

---
 .travis.yml          | 1 -
 opam                 | 2 +-
 script/coqproject.sh | 8 ++++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a9487631..e67ccb1d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,6 @@ env:
     - COQ_VERSION=8.5.3
     - SSREFLECT_VERSION=1.6
     - VERDI_RAFT_BRANCH=master
-    - STRUCTTACT_BRANCH=master
   matrix:
     - DOWNSTREAM=none
 before_install:
diff --git a/opam b/opam
index 3343d04c..2c736567 100644
--- a/opam
+++ b/opam
@@ -11,7 +11,7 @@ build: [
   [ make "-j%{jobs}%" ]
 ]
 install: [ make "install" ]
-remove: [ "sh" "-c" "rm -rf '%{lib}%/coq/user-contrib/Verdi" ]
+remove: [ "sh" "-c" "rm -rf '%{lib}%/coq/user-contrib/Verdi'" ]
 depends: [
   "coq" {>= "8.5" & < "8.6~"}
   "coq-mathcomp-ssreflect" {>= "1.6"}
diff --git a/script/coqproject.sh b/script/coqproject.sh
index 2550b558..62f10da8 100755
--- a/script/coqproject.sh
+++ b/script/coqproject.sh
@@ -24,7 +24,11 @@ function dep_dirs_lines(){
       namespace_var=${namespace_var//-/_}
       namespace_var=${namespace_var//./_}
       namespace=${!namespace_var:=$2}
-      LINE="-Q $1/$dep_dir/ $namespace"
+      if [ $dep_dir = "." ]; then
+        LINE="-Q $1 $namespace"
+      else
+	LINE="-Q $1/$dep_dir $namespace"
+      fi
       echo $LINE >> $COQPROJECT_TMP
   done
 }
@@ -66,7 +70,7 @@ for dir in ${DIRS[@]}; do
     namespace_var=${namespace_var//-/_}
     namespace_var=${namespace_var//./_}
     namespace=${!namespace_var:="\"\""}
-    LINE="-Q $dir/ $namespace"
+    LINE="-Q $dir $namespace"
     echo $LINE >> $COQPROJECT_TMP
 done