From 808334710ed7ad86df68fad90ed007e834665f77 Mon Sep 17 00:00:00 2001
From: Gerald Klinkl <gerald.klinkl@ctbto.org>
Date: Thu, 20 Oct 2016 13:48:57 +0000
Subject: [PATCH] Remove CTBTO specific paths from general makefiles

Also remove -DCTBTO from DEFS in makefile.general.ifort
---
 flexpart_code/makefile.general.gfortran |  5 ++---
 flexpart_code/makefile.general.ifort    | 10 ++++------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/flexpart_code/makefile.general.gfortran b/flexpart_code/makefile.general.gfortran
index 99bb1bce..7b97b90d 100644
--- a/flexpart_code/makefile.general.gfortran
+++ b/flexpart_code/makefile.general.gfortran
@@ -12,9 +12,8 @@ DEFS =
 
 FC       = gfortran
 
-# devlan
-INCPATH  = /dvl/atm/software/local/include
-LIBPATH1 = /dvl/atm/software/usr/lib
+INCPATH  = /usr/local/include
+LIBPATH1 = /usr/local/lib
 LIBPATH2 = /usr/lib/x86_64-linux-gnu
 
 
diff --git a/flexpart_code/makefile.general.ifort b/flexpart_code/makefile.general.ifort
index 876c27a9..bdf2a675 100644
--- a/flexpart_code/makefile.general.ifort
+++ b/flexpart_code/makefile.general.ifort
@@ -1,17 +1,15 @@
 SHELL = /bin/bash
-FLEXPART_EXECUTABLE = flexpart_ifort   
+FLEXPART_EXECUTABLE = flexpart_ifort
 GRIB2FLEXPART_EXECUTABLE = grib2flexpart_ifort
 
 #############################################
 #DEFS = -DCTBTO
-DEFS = -DCTBTO
 #############################################
 
-# Set up for devlan ifort
-INTEL_ROOT = /cots/intel/composer_xe_2013.2.146
-GRIB_API_ROOT = /dvl/atm/klinkl/src/ifort_grib_api/grib_api-1.12.3
+INTEL_ROOT = /usr/local/intel/composer_xe_2013.2.146
+GRIB_API_ROOT = /usr/local/src/ifort_grib_api/grib_api-1.12.3
 
-FC       = $(INTEL_ROOT)/bin/ifort
+FC = $(INTEL_ROOT)/bin/ifort
 
 INCPATH = $(GRIB_API_ROOT)/fortran
 LIBPATH1 = $(GRIB_API_ROOT)/fortran/.libs
-- 
GitLab