diff --git a/Makefile b/Makefile index 1378650..5ea36f4 100755 --- a/Makefile +++ b/Makefile @@ -4,24 +4,24 @@ SYSDDIR_=${shell pkg-config systemd --variable=systemdsystemunitdir} SYSDDIR=${SYSDDIR_:/%=%} DESTDIR=/ -VERSION=23.21.1 +VERSION=23.21.2 LDFLAGS=-ldflags "-s -w -X main.version=${VERSION}" -tags osusergo,netgo -all: ${TARGET} +all: web/*.pug.go ${TARGET} -.PHONY: ${TARGET} install uninstall +.PHONY: ${TARGET} ${TARGET}: - go generate web/web.go go build -o bin/$@ ${LDFLAGS} cmd/$@/main.go +web/*.pug.go: web/templates/*.pug + go install github.com/Joker/jade/cmd/jade@latest + go generate web/web.go + run: bin/${TARGET} -l 127.0.0.1:18123 -db . -ce 10m -gbo Arav -gbp 10 -install-jade: - go install github.com/Joker/jade/cmd/jade@latest - install: install -Dm 0755 bin/${TARGET} ${DESTDIR}usr/bin/${TARGET} install -Dm 0644 init/systemd.service ${DESTDIR}${SYSDDIR}/${TARGET}.service diff --git a/build/archlinux/PKGBUILD b/build/archlinux/PKGBUILD index 77891d3..d8e3b4b 100644 --- a/build/archlinux/PKGBUILD +++ b/build/archlinux/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Alexander "Arav" Andreev pkgname=dwelling-home -pkgver=23.21.1 +pkgver=23.21.2 pkgrel=1 pkgdesc="Arav's dwelling / Home" arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64') @@ -15,13 +15,7 @@ md5sums=('SKIP') build() { cd "$srcdir/$pkgname" - export GOPATH="$srcdir"/gopath - - if [ ! -f "$(go env GOPATH)/bin/jade" ]; then - make DESTDIR="$pkgdir" install-jade - fi - make VERSION=$pkgver DESTDIR="$pkgdir/" }