diff --git a/Makefile b/Makefile --- a/Makefile +++ b/Makefile @@ -1,6 +1,7 @@ REPO=repo TMP=sdk ARGS="--user" +FSDK_VERSION?=1.6 ARCH?=$(shell flatpak --default-arch) all: $(REPO)/config $(foreach file, $(wildcard *.json), $(subst .json,.app,$(file))) @@ -15,15 +16,15 @@ ostree init --mode=archive-z2 --repo=$(REPO) remotes: - flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo + flatpak remote-add --if-not-exists $(ARGS) flathub https://dl.flathub.org/repo/flathub.flatpakrepo deps: - flatpak install --arch=$(ARCH) $(ARGS) flathub org.freedesktop.Platform.Locale 1.6; true - flatpak install --arch=$(ARCH) $(ARGS) flathub org.freedesktop.Sdk.Locale 1.6; true - flatpak install --arch=$(ARCH) $(ARGS) flathub org.freedesktop.Platform 1.6; true - flatpak install --arch=$(ARCH) $(ARGS) flathub org.freedesktop.Sdk 1.6; true - flatpak install --arch=$(ARCH) $(ARGS) flathub org.freedesktop.Sdk.Debug 1.6; true - flatpak install --arch=$(ARCH) $(ARGS) flathub org.freedesktop.Sdk.Docs 1.6; true + flatpak install --arch=$(ARCH) $(ARGS) flathub org.freedesktop.Platform.Locale $(FSDK_VERSION); true + flatpak install --arch=$(ARCH) $(ARGS) flathub org.freedesktop.Sdk.Locale $(FSDK_VERSION); true + flatpak install --arch=$(ARCH) $(ARGS) flathub org.freedesktop.Platform $(FSDK_VERSION); true + flatpak install --arch=$(ARCH) $(ARGS) flathub org.freedesktop.Sdk $(FSDK_VERSION); true + flatpak install --arch=$(ARCH) $(ARGS) flathub org.freedesktop.Sdk.Debug $(FSDK_VERSION); true + flatpak install --arch=$(ARCH) $(ARGS) flathub org.freedesktop.Sdk.Docs $(FSDK_VERSION); true check: json-glib-validate *.json