X-Git-Url: https://git.ladys.computer/Langdev/blobdiff_plain/730f6c9d045d513e879738c7eaa776cfca7c16f1..2669b8bc6f67a258f4b7354976e0168c80a36a82:/GNUmakefile diff --git a/GNUmakefile b/GNUmakefile index 026308b..48cca59 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -31,10 +31,10 @@ ensure-clean: @if output=$$(git status --porcelain) && [ ! -z "$$output" ]; then echo 'Error: There are uncommitted changes!' >&2; echo 'Commit changes and run `make` before syncing.' >&2; exit 1; fi dry-sync: ensure-clean$(if $(GIT_FORCE),, ensure-branch-up-to-date) ensure-build - $(RSYNC) $(RSYNC_FLAGS) --del --dry-run --filter=". $(RSYNC_FILTER)" --iconv=$(SOURCE_CHARSET),$(DESTINATION_CHARSET) $(RSYNC_OPTIONS) . $(DESTINATION) + cd public && $(RSYNC) $(RSYNC_FLAGS) --del --dry-run --filter=". ../$(RSYNC_FILTER)" --iconv=$(SOURCE_CHARSET),$(DESTINATION_CHARSET) $(RSYNC_OPTIONS) . $(DESTINATION) sync: ensure-clean$(if $(GIT_FORCE),, ensure-branch-up-to-date) ensure-build - $(RSYNC) $(RSYNC_FLAGS) --del --filter=". $(RSYNC_FILTER)" --iconv=$(SOURCE_CHARSET),$(DESTINATION_CHARSET) $(RSYNC_OPTIONS) . $(DESTINATION) + cd public && $(RSYNC) $(RSYNC_FLAGS) --del --filter=". ../$(RSYNC_FILTER)" --iconv=$(SOURCE_CHARSET),$(DESTINATION_CHARSET) $(RSYNC_OPTIONS) . $(DESTINATION) git push$(if $(GIT_FORCE), --force,) .PHONY: build dry-sync ensure-branch-up-to-date ensure-build ensure-clean sync;