diff --git a/.github/workflows/pages.yaml b/.github/workflows/pages.yaml index 077edb4..0911735 100644 --- a/.github/workflows/pages.yaml +++ b/.github/workflows/pages.yaml @@ -19,7 +19,7 @@ jobs: - run: make all - uses: actions/upload-pages-artifact@v3 with: - path: pub + path: public - id: deployment uses: actions/deploy-pages@v4 environment: diff --git a/.gitignore b/.gitignore index 217ec97..57c4c2b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -/pub/ +/public/ /nanoidgen diff --git a/GNUmakefile b/GNUmakefile index 1487a06..88ea737 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -2,34 +2,34 @@ MANDOC ?= mandoc default: nanoidgen -all: pub/man.pdf pub/man/nanoid.3.html pub/man/nanoidgen.1.html \ - pub/openbsd/man.pdf pub/openbsd/man/nanoid.3.html nanoidgen +all: public/man.pdf public/man/nanoid.3.html public/man/nanoidgen.1.html \ + public/openbsd/man.pdf public/openbsd/man/nanoid.3.html nanoidgen clean: - rm -r pub nanoidgen + rm -r public nanoidgen .PHONY: default all clean -pub: +public: mkdir -p $@ -pub/man: pub +public/man: public mkdir -p $@ -pub/man.pdf: nanoid.3 nanoidgen.1 pub +public/man.pdf: nanoid.3 nanoidgen.1 public $(MANDOC) -T pdf nanoid.3 nanoidgen.1 > $@ -pub/man/%.html: % pub/man +public/man/%.html: % public/man $(MANDOC) -T html $< > $@ -pub/openbsd: pub +public/openbsd: public mkdir -p $@ -pub/openbsd/man: pub/openbsd +public/openbsd/man: public/openbsd mkdir -p $@ -pub/openbsd/man.pdf: openbsd/nanoid.3 nanoidgen.1 pub/openbsd +public/openbsd/man.pdf: openbsd/nanoid.3 nanoidgen.1 public/openbsd $(MANDOC) -T pdf openbsd/nanoid.3 nanoidgen.1 > $@ -pub/openbsd/man/%.html: openbsd/% pub/openbsd/man +public/openbsd/man/%.html: openbsd/% public/openbsd/man $(MANDOC) -T html $< > $@