Commit Diff


commit - 469661fc46614594421fb2cf25a72647ab4b12ce
commit + 40206efc3a16de026879960195860d5ad05b5d81
blob - 4bfeb97f9fa0fa38cf64a602f98248fa588b893f
blob + 2e23fc77f0c896553b6f2633fe47b7d8908bfb77
--- Makefile
+++ Makefile
@@ -1,14 +1,13 @@
 HUGO?=hugo
 HUGO_FLAGS?=
 OPENRING?=openring
-HUT?=hut
-PAGES_SITE?=witcher.srht.site
 
 HUGO_OUTPUT=public
 OPENRING_INPUT=webring-in.template
 OPENRING_OUTPUT=layouts/partials/webring-out.html
-SITE_TARBALL=site.tar.gz
 
+BUILD_SITE=https://wiredspace.de
+
 DEPLOY_USER?=srht-deploy
 DEPLOY_SITE?=wiredspace.de
 DEPLOY_DIR?=/var/www/htdocs/wiredspace.de
@@ -45,7 +44,7 @@ $(OPENRING_OUTPUT): $(OPENRING_INPUT)
 	$(OPENRING) $(OPENRING_ARGS) < $< > $@
 
 $(HUGO_OUTPUT): openring
-	$(HUGO)
+	$(HUGO) --baseURL="$(BUILD_SITE)"
 
 $(SITE_TARBALL): build
 	(cd $(HUGO_OUTPUT)/ && tar -cf- * | gzip -c) > $@
@@ -54,10 +53,6 @@ $(SITE_TARBALL): build
 publish-web: $(HUGO_OUTPUT)
 	rsync -r --delete $</ $(DEPLOY_USER)@$(DEPLOY_SITE):$(DEPLOY_DIR)
 
-.PHONY: publish-pages
-publish-pages: $(SITE_TARBALL)
-	$(HUT) pages publish -d $(PAGES_SITE) $<
-
 .PHONY: build
 build: $(HUGO_OUTPUT)
 
@@ -72,7 +67,7 @@ pack: $(SITE_TARBALL)
 openring: $(OPENRING_OUTPUT)
 
 .PHONY: publish
-publish: publish-web publish-pages
+publish: publish-web
 
 .PHONY: clean
 clean: