summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAshish Gupta <ashmew2@gmail.com>2017-04-15 21:52:42 (GMT)
committer Ashish Gupta <ashmew2@gmail.com>2017-09-12 17:56:08 (GMT)
commit8ed4af304ae31c4fde0697b1db95519acdee4062 (patch)
treea7f34b2d7565a116a6253cea37d7cf2c85224952
parent0261c1ca0e5f47e08ec225d679b6bb0f2e041b71 (diff)
downloadnetsurf-8ed4af304ae31c4fde0697b1db95519acdee4062.tar.gz
netsurf-8ed4af304ae31c4fde0697b1db95519acdee4062.tar.bz2
Fix up makefiles to build with make TARGET=kolibrios install
-rw-r--r--Makefile6
-rw-r--r--frontends/kolibrios/Makefile13
-rw-r--r--frontends/kolibrios/Makefile.defaults2
3 files changed, 11 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index 65da22b..8175509 100644
--- a/Makefile
+++ b/Makefile
@@ -136,11 +136,7 @@ MESSAGES_TARGET=!NetSurf/Resources
PERL=perl
MKDIR=mkdir
TOUCH=touch
-ifneq ($(TARGET),kolibrios)
- STRIP?=strip
-else
- STRIP?=kos32-strip
-endif
+STRIP?=strip
SPLIT_MESSAGES=$(PERL) utils/split-messages.pl
# build verbosity
diff --git a/frontends/kolibrios/Makefile b/frontends/kolibrios/Makefile
index 1d7b939..1cf0698 100644
--- a/frontends/kolibrios/Makefile
+++ b/frontends/kolibrios/Makefile
@@ -7,11 +7,10 @@ CFLAGS += $(KOL_OTHER_INCLUDES) $(DMACROS) -std=c99 -g
CFLAGS += '-DNETSURF_KOLIBRI_FONTPATH="$(NETSURF_KOLIBRI_FONTPATH)"'
CFLAGS += '-DKOLIBRIOS_RESPATH="$(NETSURF_KOLIBRI_RESPATH)"'
-#CFLAGS += '-DKOLIBRI_USE_FREETYPE'
##########################################################################
# Only for FB compat with kolibri. Get rid soon.
-CFLAGS += '-DNETSURF_FB_RESPATH="$(NETSURF_KOLIBRI_RESPATH)"'
+CFLAGS += '-DKOLIBRI_RUNTIME_RESPATH="$(NETSURF_KOLIBRI_RESPATH)"'
# compile time font locations
CFLAGS += '-DNETSURF_FB_FONTPATH="$(NETSURF_KOLIBRI_FONTPATH)"'
@@ -141,5 +140,13 @@ SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_FRONTEND) $(S_IMAGES) $(S_FON
EXETARGET := nskolibrios
-install-kolibri:
+## Install specific stuff
+DESTDIR := $(PREFIX)/bin
+DESTRESDIR := $(PREFIX)/res
+KOLIBRI_RES_DIR := $(HOME)/NETSURFLIBS/netsurf/frontends/kolibrios/res
+
+install-kolibrios:
+ $(Q)$(MKDIR) -p $(DESTDIR)
+ $(Q)install $(EXETARGET) $(DESTDIR)/netsurf-kolibrios
+ $(Q)cp -r $(KOLIBRI_RES_DIR) $(DESTRESDIR)
diff --git a/frontends/kolibrios/Makefile.defaults b/frontends/kolibrios/Makefile.defaults
index 033c5b3..8344638 100644
--- a/frontends/kolibrios/Makefile.defaults
+++ b/frontends/kolibrios/Makefile.defaults
@@ -38,5 +38,3 @@ NETSURF_FRAMEBUFFER_RESOURCES := $(PREFIX)/share/netsurf/
# Res path when running on KolibriOS
NETSURF_KOLIBRI_RESPATH := /usbhd0/1/res
-#Where are the fonts in Kolibri?
-NETSURF_KOLIBRI_FONTPATH := /usbhd0/1/res/