diff --git a/Makefile b/Makefile index b953fe9..53ecf78 100644 --- a/Makefile +++ b/Makefile @@ -15,6 +15,7 @@ ARCH_PKG_DIR ?= packaging/archlinux/keepassgo-git ARCH_PKG_TMPL ?= $(ARCH_PKG_DIR)/PKGBUILD.tmpl ARCH_PKGBUILD ?= $(ARCH_PKG_DIR)/PKGBUILD ARCH_PKGVER ?= $(shell printf 'r%s.%s' "$$(git rev-list --count HEAD 2>/dev/null || echo 0)" "$$(git rev-parse --short HEAD 2>/dev/null || echo dev)") +ARCH_REPO_DIR ?= $(CURDIR) GOGIO_SIGN_FLAGS := ifneq ($(strip $(SIGNKEY)),) @@ -61,8 +62,9 @@ android/keepassgo-android.jar: $(shell find androidsrc -type f | sort) $$(find androidsrc -name '\''*.java'\'' | sort); \ "$(JAVA_HOME)/bin/jar" --create --file "$$(pwd)/android/keepassgo-android.jar" -C "$$tmpdir" .' -$(ARCH_PKGBUILD): $(ARCH_PKG_TMPL) Makefile +archlinux-pkgbuild: $(ARCH_PKG_TMPL) Makefile @mkdir -p "$(ARCH_PKG_DIR)" - @sed "s/@PKGVER@/$(ARCH_PKGVER)/g" "$(ARCH_PKG_TMPL)" > "$(ARCH_PKGBUILD)" - -archlinux-pkgbuild: $(ARCH_PKGBUILD) + @sed \ + -e 's|@PKGVER@|$(ARCH_PKGVER)|g' \ + -e 's|@REPO_DIR@|$(ARCH_REPO_DIR)|g' \ + "$(ARCH_PKG_TMPL)" > "$(ARCH_PKGBUILD)" diff --git a/packaging/archlinux/keepassgo-git/PKGBUILD.tmpl b/packaging/archlinux/keepassgo-git/PKGBUILD.tmpl index 180ebf0..358b845 100644 --- a/packaging/archlinux/keepassgo-git/PKGBUILD.tmpl +++ b/packaging/archlinux/keepassgo-git/PKGBUILD.tmpl @@ -27,13 +27,7 @@ source=('git+https://git.julianfamily.org/joejulian/keepassgo.git') sha256sums=('SKIP') _repo_dir() { - if [[ -d "${srcdir}/keepassgo/.git" ]]; then - printf '%s\n' "${srcdir}/keepassgo" - return - fi - - cd "${startdir}/../../.." || exit 1 - pwd + printf '%s\n' "@REPO_DIR@" } pkgver() {