summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Silverstone <dsilvers@netsurf-browser.org>2009-04-21 22:56:38 +0000
committerDaniel Silverstone <dsilvers@netsurf-browser.org>2009-04-21 22:56:38 +0000
commit316c1cbfbe2cc656f45a5c86c549a7a52cae2911 (patch)
tree0089b96627233ed893c58959e33cabfba1278c51
parent89f0a452f25ae63b717ff69de421266b5f013ae8 (diff)
downloadnetsurf-316c1cbfbe2cc656f45a5c86c549a7a52cae2911.tar.gz
netsurf-316c1cbfbe2cc656f45a5c86c549a7a52cae2911.tar.bz2
Update framebuffer paths to use PREFIX, add install-framebuffer target
svn path=/trunk/netsurf/; revision=7222
-rw-r--r--Makefile8
-rw-r--r--Makefile.defaults9
2 files changed, 13 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 46ff351f8..7f7a184a7 100644
--- a/Makefile
+++ b/Makefile
@@ -819,7 +819,13 @@ install-beos: NetSurf
@cp -vRL gtk/res/license $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
# @cp -vRL beos/res/throbber/*.png $(DESTDIR)$(NETSURF_BEOS_RESOURCES)throbber
gzip -9v < beos/res/messages > $(DESTDIR)$(NETSURF_BEOS_RESOURCES)messages
-
+
+
+install-framebuffer: $(EXETARGET)
+ mkdir -p $(DESTDIR)$(NETSURF_FRAMEBUFFER_BIN)
+ mkdir -p $(DESTDIR)$(NETSURF_FRAMEBUFFER_RESOURCES)
+ @cp -v $(EXETARGET) $(DESTDIR)/$(NETSURF_FRAMEBUFFER_BIN)netsurf$(SUBTARGET)
+ @for F in Aliases default.css messages; do cp -vL framebuffer/res/$$F $(DESTDIR)/$(NETSURF_FRAMEBUFFER_RESOURCES); done
install: all-program install-$(TARGET)
diff --git a/Makefile.defaults b/Makefile.defaults
index c09065c74..ae922c26e 100644
--- a/Makefile.defaults
+++ b/Makefile.defaults
@@ -214,11 +214,14 @@ ifeq ($(TARGET),framebuffer)
# Framebuffer frontends may have differing root paths for resources
# As such, these specify the resource path and config path.
- NETSURF_FB_RESPATH_linux := /usr/share/netsurf/
+ NETSURF_FB_RESPATH_linux := $(PREFIX)/share/netsurf/
NETSURF_FB_RESPATH_able := (tftpboot)/
NETSURF_FB_RESPATH_dummy := ./
- NETSURF_FB_RESPATH_sdl := ./
- NETSURF_FB_RESPATH_vnc := /usr/share/netsurf/
+ NETSURF_FB_RESPATH_sdl := $(PREFIX)/share/netsurf/
+ NETSURF_FB_RESPATH_vnc := $(PREFIX)/share/netsurf/
+
+ NETSURF_FRAMEBUFFER_RESOURCES = $(NETSURF_FB_RESPATH_$(NETSURF_FB_FRONTEND))
+ NETSURF_FRAMEBUFFER_BIN := $(PREFIX)/bin/
endif