diff --git a/.travis.yml b/.travis.yml
index 25b0b46..da5c03a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,14 @@
-language: c
+language: cpp
 os:
   - linux
+  - osx
+branches:
+  only:
+    - master
 compiler:
   - gcc
   - clang
 before_install:
   - cp golded3/mygolded.__h golded3/mygolded.h
 script:
-  - ./dist-gpl.sh
+  - make
diff --git a/GNUmakef.def b/GNUmakef.def
index 630d88f..6dd97aa 100644
--- a/GNUmakef.def
+++ b/GNUmakef.def
@@ -123,8 +123,12 @@ ifeq ($(PLATFORM),osx) # Mac OSX
 CAT=cat
 SED=sed
 GREP=grep
+ifndef CC
 CC=gcc
+endif
+ifndef CXX
 CXX=g++
+endif
 AR=ar
 RANLIB=ranlib
 PLATFORM=osx
@@ -141,8 +145,12 @@ else                   # Linux, *BSD or another unix-like OS
 CAT=cat
 SED=sed
 GREP=grep
+ifndef CC
 CC=gcc
+endif
+ifndef CXX
 CXX=g++
+endif
 AR=ar
 RANLIB=ranlib
 PLATFORM=lnx