diff options
| author | Ashish Gupta <ashmew2@gmail.com> | 2017-04-15 23:52:42 +0200 |
|---|---|---|
| committer | Ashish Gupta <ashmew2@gmail.com> | 2017-10-25 22:04:54 +0200 |
| commit | 476423b2ec5479efd3fbe5a83689dfad6622036a (patch) | |
| tree | a85967383f2ae3a6b3b300e0a68f9d0cfdcdcdc9 /frontends/kolibrios | |
| parent | 58c351e8e51fd2172fec234a4137204cc13b6437 (diff) | |
| download | netsurf-476423b2ec5479efd3fbe5a83689dfad6622036a.tar.gz netsurf-476423b2ec5479efd3fbe5a83689dfad6622036a.tar.bz2 | |
Fix up makefiles to build with make TARGET=kolibrios install
Diffstat (limited to 'frontends/kolibrios')
| -rw-r--r-- | frontends/kolibrios/Makefile | 13 | ||||
| -rw-r--r-- | frontends/kolibrios/Makefile.defaults | 2 |
2 files changed, 10 insertions, 5 deletions
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/ |