From 0b69db2ff4429a321dbe25564c89dbf3b3f43d73 Mon Sep 17 00:00:00 2001
From: ale <ale@incal.net>
Date: Sat, 2 Apr 2016 13:23:19 +0100
Subject: [PATCH] simplify debian build rules a bit

---
 debian/control | 2 +-
 debian/rules   | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index 311d06b..f857256 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: liber
 Section: net
 Priority: extra
 Maintainer: ale <ale@incal.net>
-Build-Depends: debhelper (>= 8.0.0), dh-systemd (>= 1.5)
+Build-Depends: debhelper (>= 8.0.0), dh-systemd (>= 1.5), golang-go (>= 1.5)
 Standards-Version: 3.9.4
 Homepage: https://git.autistici.org/ale/liber
 
diff --git a/debian/rules b/debian/rules
index 12af07b..d17d4bb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,12 +16,10 @@ PKGDIR = $(DEBDIR)/liber
 	dh $@ --with systemd
 
 override_dh_install:
-	# Build the sources using your locally-installed Go version.
-	# NB: This is not an acceptable way to build a proper Debian package.
 	install -m 755 -o root -g root -d $(PKGDIR)/usr/bin
 	install -m 755 -o root -g root -d $(PKGDIR)/usr/share/liber
 	-mkdir build
-	(export PATH=$$PATH:/usr/local/go/bin ; export GOPATH=$(CURDIR)/build ; mkdir -p build/src/$(shell dirname $(DH_GOPKG)) ; ln -s $(CURDIR) build/src/$(DH_GOPKG) ; cd build/src/$(DH_GOPKG) && go install -v ./...)
+	(export GOPATH=$(CURDIR)/build ; mkdir -p build/src/$(shell dirname $(DH_GOPKG)) ; ln -s $(CURDIR) build/src/$(DH_GOPKG) ; cd build/src/$(DH_GOPKG) && go install -v ./...)
 	(for f in liber liberdbtool ; do \
 	 install -m 755 -o root -g root build/bin/$$f $(PKGDIR)/usr/bin/$$f ; done)
 	(umask 022; cp -R --preserve=timestamps htdocs $(PKGDIR)/usr/share/liber/htdocs)
-- 
GitLab