From 476423b2ec5479efd3fbe5a83689dfad6622036a Mon Sep 17 00:00:00 2001
From: Ashish Gupta <ashmew2@gmail.com>
Date: Sat, 15 Apr 2017 23:52:42 +0200
Subject: Fix up makefiles to build with make TARGET=kolibrios install

---
 Makefile                              |  6 +-----
 frontends/kolibrios/Makefile          | 13 ++++++++++---
 frontends/kolibrios/Makefile.defaults |  2 --
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 65da22bca..8175509d1 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 1d7b93952..1cf0698a6 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 033c5b3eb..83446383e 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/
-- 
cgit v1.2.3