--- a/Makefile	Mon Sep 23 14:24:27 2019 +0200
+++ b/Makefile	Mon Sep 23 15:15:48 2019 +0200
@@ -12,18 +12,14 @@
 
 export BUILDBASE
 
-3rdpartylibs-stamp := $(BUILDBASE)/3rdpartylibs-build
-
-.PHONY: all 3rdpartylibs gemma client clean
+.PHONY: all gemma client clean
 
 all: gemma client
 
 $(ENVWARPPER):
 	@echo "Preparing go build environment:"
+	mkdir -p "$(GOPATH)"
 	mkdir -p "$(GOCACHE)"
-	mkdir -p "$(GOPATH)/src/gemma.intevation.de"
-	[ -e "$(GOPATH)/src/gemma.intevation.de/gemma" ] || \
-	  ln -s "$(basedir)" "$(GOPATH)/src/gemma.intevation.de/gemma"
 	@echo "Creating wrapper script:"
 	echo '#!/bin/sh' >"$(ENVWARPPER)"
 	echo 'export GOPATH=$(GOPATH)' >>"$(ENVWARPPER)"
@@ -31,14 +27,8 @@
 	echo 'exec "$$@"' >>"$(ENVWARPPER)"
 	chmod +x "$(ENVWARPPER)"
 
-$(3rdpartylibs-stamp): $(ENVWARPPER) 3rdpartylibs.sh
-	"$(ENVWARPPER)" bash ./3rdpartylibs.sh && \
-	touch $@
-
-3rdpartylibs: $(3rdpartylibs-stamp)
-
-gemma: $(3rdpartylibs-stamp) $(ENVWARPPER)
-	cd cmd/gemma && "$(ENVWARPPER)" go build
+gemma: $(ENVWARPPER)
+	"$(ENVWARPPER)" go build -o ./cmd/gemma/gemma ./cmd/gemma
 
 client:
 	$(MAKE) -f Makefile.build -C client
@@ -55,4 +45,5 @@
 clean:
 	$(MAKE) -f Makefile.build -C client $@
 	rm -f "$(gemma-bin)"
+	chmod -R u+w "$(BUILDBASE)" # This is neccessary for deletion to work...
 	rm -rf "$(BUILDBASE)"