Remove TOPCARATDIR from the Makefile

Also update Travis CI setup accordingly.
lbfm-rwth · Nov 25, 2018 · cc4927c · cc4927c
1 parent e2c2c68
commit cc4927c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,12 +2,11 @@
 dist: xenial
 language: c
 
-# temporary measure until we will have a proper configure script
-
 compiler:
   - clang
   - gcc
 
+# temporary hack with sed until we will have a proper configure script
 script:
-  - sed -i 's|TOPCARATDIR=|TOPDIR=/home/travis/build/lbfm-rwth/carat|g' Makefile
+  - sed -i 's|TOPDIR=/path/to/the/directory/containing/this/makefile|TOPDIR=/home/travis/build/lbfm-rwth/carat|g' Makefile
   - make
diff --git a/Makefile b/Makefile
@@ -24,7 +24,7 @@
 # put the top level directory of the Installation here
 # ( try "pwd" if in doubt)
 #
-TOPCARATDIR=
+TOPDIR=/path/to/the/directory/containing/this/makefile
 
 #
 # normal installations on Linux should work with

diff --git a/README.install b/README.install
@@ -20,9 +20,8 @@ INSTALLATION:
 
 Just edit the Makefile in the directory you installed CARAT in, and
 change the variables 
-    TOPCARATDIR (which is the output of pwd when in the directory this makefile is stored in)
+     TOPDIR (which is the output of pwd when in the directory this makefile is stored in)
      CFLAGS
-     TOPDIR
 according to your needs. Some additional explanations/examples are given
 there.
 For Mac users only: You need to delete the line "#include <malloc.h>" from include/typedef.h. This will be fixed once there is