From a36e98b8ae350eed0e9cde2ffeea0626c0f570c5 Mon Sep 17 00:00:00 2001 From: "Gabriel A. Giovanini" Date: Sat, 5 Oct 2024 15:22:12 +0200 Subject: feat: Add install rule Now it is possible to run "make install". --- Makefile | 28 ++++++++++++++++++---------- README.md | 22 +++++++++++++++++----- 2 files changed, 35 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index 17e424d..c235179 100644 --- a/Makefile +++ b/Makefile @@ -1,19 +1,26 @@ -GIT_COMMIT ?= $(shell git rev-parse --short HEAD) -LDFLAGS := "-X 'git.gabrielgio.me/cerrado/templates.Slug=.$(GIT_COMMIT)' -s -w" +GIT_COMMIT ?= $(shell git rev-parse --short HEAD) +LDFLAGS := "-X 'git.gabrielgio.me/cerrado/templates.Slug=.$(GIT_COMMIT)' -s -w" -TEMPLATES_DIR := templates -TEMPLATES := $(wildcard $(TEMPLATES_DIR)/*.qtpl) -GO_TEMPLATES_FILES := $(TEMPLATES:.qtpl=.qtpl.go) +BIN ?= cerrado +PREFIX ?= /usr/local +BINDIR ?= $(PREFIX)/bin -SASS_DIR := scss -CSS_DIR := static -OUTPUT_CSS := $(CSS_DIR)/main.$(GIT_COMMIT).css -SASS_FILES := $(wildcard $(SASS_DIR)/*.scss) +TEMPLATES_DIR := templates +TEMPLATES := $(wildcard $(TEMPLATES_DIR)/*.qtpl) +GO_TEMPLATES_FILES := $(TEMPLATES:.qtpl=.qtpl.go) + +SASS_DIR := scss +CSS_DIR := static +OUTPUT_CSS := $(CSS_DIR)/main.$(GIT_COMMIT).css +SASS_FILES := $(wildcard $(SASS_DIR)/*.scss) build: sass tmpl go build \ -ldflags=$(LDFLAGS) \ - -o bin/cerrado + -o bin/$(BIN) + +install: + install -Dm755 bin/$(BIN) $(BINDIR)/$(BIN) run: sass tmpl go run . @@ -34,5 +41,6 @@ $(TEMPLATES_DIR)/%.qtpl.go: $(TEMPLATES_DIR)/%.qtpl clean: rm -f $(OUTPUT_CSS) + rm bin/$(BIN) .PHONY: sass tmpl diff --git a/README.md b/README.md index 267a306..ec8ee17 100644 --- a/README.md +++ b/README.md @@ -27,12 +27,24 @@ To run the project you just need to do a make run. ### Installations -The only installation process available so far is through my apk -repository[^2][^3]. +One installation process available is through my apk repository[^2][^3]. -You can check openrc files for the details how it is run, but in general you'd -need the cerrado binary and scfg file. I can easily be integration with -systemd. +You could also run: + +```sh +make +make install +``` + +Or you could also pick another prefix: + +```sh +PREFIX=$HOME/.local/ make install +``` + +You can check openrc files for the details how it is run with a init system, +but in general you'd need the cerrado binary and scfg file, which can easily be +integrated with systemd. ### Contributing -- cgit v1.2.3