summaryrefslogtreecommitdiff
path: root/Makefile.defaults
diff options
context:
space:
mode:
authorVincent Sanders <vince@netsurf-browser.org>2012-08-22 16:58:11 +0100
committerVincent Sanders <vince@netsurf-browser.org>2012-08-22 16:58:11 +0100
commit7604b76161b16d11a4d70859a03a1c40d415a7ce (patch)
treed4610757a45afc162b8ffc3d54eba49b3040a8c8 /Makefile.defaults
parent29356734eb6d537d606a5f00c040b3619d061519 (diff)
downloadnetsurf-7604b76161b16d11a4d70859a03a1c40d415a7ce.tar.gz
netsurf-7604b76161b16d11a4d70859a03a1c40d415a7ce.tar.bz2
make the framebuffer resource path setting better
Diffstat (limited to 'Makefile.defaults')
-rw-r--r--Makefile.defaults25
1 files changed, 12 insertions, 13 deletions
diff --git a/Makefile.defaults b/Makefile.defaults
index 134795649..8ee569c5a 100644
--- a/Makefile.defaults
+++ b/Makefile.defaults
@@ -288,9 +288,7 @@ ifeq ($(TARGET),framebuffer)
# Valid options: internal, freetype
NETSURF_FB_FONTLIB := internal
- # freetype compiled in font locations
- NETSURF_FB_FONTPATH := /usr/share/fonts/truetype/ttf-dejavu:/usr/share/fonts/truetype/msttcorefonts
-
+ # Default freetype font files
NETSURF_FB_FONT_SANS_SERIF := DejaVuSans.ttf
NETSURF_FB_FONT_SANS_SERIF_BOLD := DejaVuSans-Bold.ttf
NETSURF_FB_FONT_SANS_SERIF_ITALIC := DejaVuSans-Oblique.ttf
@@ -302,18 +300,19 @@ ifeq ($(TARGET),framebuffer)
NETSURF_FB_FONT_CURSIVE := Comic_Sans_MS.ttf
NETSURF_FB_FONT_FANTASY := Impact.ttf
- # Framebuffer frontends may have differing root paths for resources
- # As such, these specify the resource path and config path.
- NETSURF_FB_RESPATH_linux := $(PREFIX)/share/netsurf/
- NETSURF_FB_RESPATH_able := (tftpboot)/
- NETSURF_FB_RESPATH_dummy := ./
- NETSURF_FB_RESPATH_sdl := $(PREFIX)/share/netsurf/
- NETSURF_FB_RESPATH_x := $(PREFIX)/share/netsurf/
- NETSURF_FB_RESPATH_vnc := $(PREFIX)/share/netsurf/
-
- NETSURF_FRAMEBUFFER_RESOURCES = $(NETSURF_FB_RESPATH_$(NETSURF_FB_FRONTEND))
+ # Default binary install path
NETSURF_FRAMEBUFFER_BIN := $(PREFIX)/bin/
+ # Default resource install path
+ NETSURF_FRAMEBUFFER_RESOURCES := $(PREFIX)/share/netsurf/
+
+ # Default framebuffer search path
+ NETSURF_FB_RESPATH := $${HOME}/.netsurf/:$${NETSURFRES}:$(NETSURF_FRAMEBUFFER_RESOURCES):./framebuffer/res
+
+ # freetype compiled in font serch path
+ NETSURF_FB_FONTPATH := /usr/share/fonts/truetype/ttf-dejavu:/usr/share/fonts/truetype/msttcorefonts
+
+
endif
# ----------------------------------------------------------------------------