From eac3d2a6c3302e78b34f4b680b7672d4bb44f9e3 Mon Sep 17 00:00:00 2001 From: Nick White Date: Fri, 11 Nov 2022 16:45:07 +0000 Subject: Simplify flatpak build by removing make rule it used --- cmd/rescribe/makefile | 4 ---- cmd/rescribe/xyz.rescribe.rescribe.yml | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/cmd/rescribe/makefile b/cmd/rescribe/makefile index f1db3f3..46be367 100644 --- a/cmd/rescribe/makefile +++ b/cmd/rescribe/makefile @@ -28,10 +28,6 @@ dist/linux/rescribe: $(GODEPS) mkdir -p dist/linux GOOS=linux GOARCH=amd64 go build -tags embed -o $@ . -dist/linux/rescribe-nogenerate: $(GODEPS) - mkdir -p dist/linux - GOOS=linux GOARCH=amd64 go build -tags embed -o $@ . - build/darwin_amd64/rescribe: $(GODEPS) go generate mkdir -p build/darwin_amd64 diff --git a/cmd/rescribe/xyz.rescribe.rescribe.yml b/cmd/rescribe/xyz.rescribe.rescribe.yml index 04b8a5d..ede2676 100644 --- a/cmd/rescribe/xyz.rescribe.rescribe.yml +++ b/cmd/rescribe/xyz.rescribe.rescribe.yml @@ -17,8 +17,8 @@ modules: - name: rescribe buildsystem: simple build-commands: - - cd cmd/rescribe && make dist/linux/rescribe-nogenerate - - install -Dm00755 cmd/rescribe/dist/linux/rescribe-nogenerate $FLATPAK_DEST/bin/rescribe-bin + - cd cmd/rescribe && GOOS=linux GOARCH=amd64 go build -tags embed . + - install -Dm00755 cmd/rescribe/rescribe $FLATPAK_DEST/bin/rescribe-bin - install -Dm00644 cmd/rescribe/icon.256.png $FLATPAK_DEST/share/icons/hicolor/256x256/apps/xyz.rescribe.rescribe.png - install -Dm00644 cmd/rescribe/xyz.rescribe.rescribe.desktop $FLATPAK_DEST/share/applications/xyz.rescribe.rescribe.desktop - install -Dm00644 cmd/rescribe/xyz.rescribe.rescribe.appdata.xml $FLATPAK_DEST/share/appdata/xyz.rescribe.rescribe.appdata.xml -- cgit v1.2.1-24-ge1ad