From 152bd867f1ee1c49788ef71352c3d3bc0f98a482 Mon Sep 17 00:00:00 2001
From: Jules Villard <jul@fb.com>
Date: Wed, 14 Nov 2018 04:11:15 -0800
Subject: [PATCH] [setup] force opam-1 while we migrate

Reviewed By: mbouaziz

Differential Revision: D13057858

fbshipit-source-id: c04d99952
---
 .travis.yml | 1 -
 Makefile    | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d9c8b167e..28f5aab33 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,6 @@ sudo: required
 language: c
 os:
   - linux
-  - osx
 services: docker
 osx_image: xcode7.3
 before_install:
diff --git a/Makefile b/Makefile
index c59fa699a..7d3b16962 100644
--- a/Makefile
+++ b/Makefile
@@ -776,7 +776,7 @@ devsetup: Makefile.autoconf
 	  echo '$(TERM_INFO)*** NOTE: The current shell is not set up for the right opam switch.$(TERM_RESET)' >&2; \
 	  echo '$(TERM_INFO)*** NOTE: Please run:$(TERM_RESET)' >&2; \
 	  echo >&2; \
-	  echo '$(TERM_INFO)  eval $$(opam config env)$(TERM_RESET)' >&2; \
+	  echo "$(TERM_INFO)  eval \$$($(OPAM) config env)$(TERM_RESET)" >&2; \
 	fi
 
 GHPAGES ?= no