diff options
| author | coadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu> | 2015-10-20 15:55:52 -0300 |
|---|---|---|
| committer | coadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu> | 2015-10-20 15:55:52 -0300 |
| commit | 2d285abfd16ebbe1a0b6e150b6ebcf6b7dd213d1 (patch) | |
| tree | 810316ecfa7b79b238b7052ee597fd68f311dcd9 | |
| parent | 24b624df3a2a5552e9dffa4aea725cbd060dd9a4 (diff) | |
Makefiles: fix variables
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | src/fnt/Makefile | 6 |
2 files changed, 3 insertions, 4 deletions
@@ -16,7 +16,6 @@ PREFIX ?= /usr SHAREDIR ?= $(PREFIX)/share -DESTDIR ?= $(SHAREDIR) all: fonts fonts: diff --git a/src/fnt/Makefile b/src/fnt/Makefile index 1468655..1f2ada7 100644 --- a/src/fnt/Makefile +++ b/src/fnt/Makefile @@ -40,7 +40,7 @@ ttf-2st-files = $(addprefix $(CURDIR)/,$(ttf-2st)) ttf-3st-files = $(addprefix $(CURDIR)/,$(ttf-3st)) # TTF target files: -trg-dir = $(DESTDIR)/fonts/TTF +trg-dir = $(DESTDIR)$(SHAREDIR)/fonts/TTF ttf-trg-files = $(addprefix $(trg-dir)/,$(ttf-3st)) all: @@ -53,8 +53,8 @@ clean: update-font-cache: fc-cache -s > /dev/null - mkfontscale $(DESTDIR)/fonts/TTF - mkfontdir $(DESTDIR)/fonts/TTF + mkfontscale $(trg-dir) + mkfontdir $(trg-dir) install: install -vdm 755 $(trg-dir) |