diff --git a/Makefile b/Makefile index 026cfd9..94a720a 100644 --- a/Makefile +++ b/Makefile @@ -7,10 +7,12 @@ all: sync $(PACKAGES) dest end $(info TEMPLATES: $(TEMPLATES)) $(info PACKAGES: $(PACKAGES)) +$(info BUILDDIR: $(BUILDDIR)) $(BUILDDIR)/%: srcpkgs/% @echo "Building package: $<" - @rm -rf $(BUILDDIR)/srcpkgs/$< + @echo $(BUILDDIR)/srcpkgs/$< + @rm -rf $(BUILDDIR)/$< @cp -ru $< $(BUILDDIR)/srcpkgs/ @cd $(BUILDDIR) && ./xbps-src clean $< @cd $(BUILDDIR) && ./xbps-src pkg $< @@ -29,7 +31,9 @@ sync: sync-build sync-fetch: test -d $(BUILDDIR) || git clone --depth=1 https://github.com/void-linux/void-packages.git $^ sync-update: sync-fetch + @cd $(BUILDDIR) && git stash >/dev/null 2>&1 @cd $(BUILDDIR) && git pull + @cd $(BUILDDIR) && git stash pop >/dev/null 2>&1 sync-build: sync-update @cd $(BUILDDIR) && ./xbps-src binary-bootstrap sync-clean: