From 231f026e6a518db00695b4c18c7f41b6c8698942 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Fri, 15 Feb 2019 17:53:31 +0000 Subject: Improve framebuffer install rule --- frontends/framebuffer/Makefile | 13 +++++++------ frontends/framebuffer/Makefile.defaults | 4 ++-- 2 files changed, 9 insertions(+), 8 deletions(-) (limited to 'frontends/framebuffer') diff --git a/frontends/framebuffer/Makefile b/frontends/framebuffer/Makefile index 9051a8801..feefc1f6e 100644 --- a/frontends/framebuffer/Makefile +++ b/frontends/framebuffer/Makefile @@ -207,12 +207,13 @@ NETSURF_FRAMEBUFFER_RESOURCE_LIST := adblock.css credits.html \ netsurf.png quirks.css welcome.html maps.html install-framebuffer: - $(Q)$(MKDIR) -p $(DESTDIR)$(NETSURF_FRAMEBUFFER_BIN) - $(Q)$(MKDIR) -p $(DESTDIR)$(NETSURF_FRAMEBUFFER_RESOURCES) - $(Q)cp -v $(EXETARGET) $(DESTDIR)/$(NETSURF_FRAMEBUFFER_BIN)netsurf-fb - $(Q)for F in $(NETSURF_FRAMEBUFFER_RESOURCE_LIST); do cp -vL $(FRONTEND_RESOURCES_DIR)/$$F $(DESTDIR)/$(NETSURF_FRAMEBUFFER_RESOURCES); done - $(Q)$(RM) $(DESTDIR)$(NETSURF_FRAMEBUFFER_RESOURCES)messages - $(Q)$(SPLIT_MESSAGES) -l en -p fb -f messages -o $(DESTDIR)$(NETSURF_FRAMEBUFFER_RESOURCES)messages -z resources/FatMessages + $(VQ)echo " INSTALL: $(DESTDIR)/$(PREFIX)" + $(Q)$(INSTALL) -d $(DESTDIR)/$(NETSURF_FRAMEBUFFER_BIN) + $(Q)$(INSTALL) -T $(EXETARGET) $(DESTDIR)/$(NETSURF_FRAMEBUFFER_BIN)/netsurf-fb + $(Q)$(INSTALL) -d $(DESTDIR)/$(NETSURF_FRAMEBUFFER_RESOURCES) + $(Q)for F in $(NETSURF_FRAMEBUFFER_RESOURCE_LIST); do $(INSTALL) -m 644 $(FRONTEND_RESOURCES_DIR)/$$F $(DESTDIR)/$(NETSURF_FRAMEBUFFER_RESOURCES); done + $(Q)$(RM) $(DESTDIR)/$(NETSURF_FRAMEBUFFER_RESOURCES)/messages + $(Q)$(SPLIT_MESSAGES) -l en -p fb -f messages -o $(DESTDIR)/$(NETSURF_FRAMEBUFFER_RESOURCES)/messages -z resources/FatMessages # ---------------------------------------------------------------------------- # Package target diff --git a/frontends/framebuffer/Makefile.defaults b/frontends/framebuffer/Makefile.defaults index cc712e992..8def7d92a 100644 --- a/frontends/framebuffer/Makefile.defaults +++ b/frontends/framebuffer/Makefile.defaults @@ -38,10 +38,10 @@ NETSURF_FB_FONT_CURSIVE := Comic_Sans_MS.ttf NETSURF_FB_FONT_FANTASY := Impact.ttf # Default binary install path -NETSURF_FRAMEBUFFER_BIN := $(PREFIX)/bin/ +NETSURF_FRAMEBUFFER_BIN := $(PREFIX)/bin # Default resource install path -NETSURF_FRAMEBUFFER_RESOURCES := $(PREFIX)/share/netsurf/ +NETSURF_FRAMEBUFFER_RESOURCES := $(PREFIX)/share/netsurf # Default framebuffer search path NETSURF_FB_RESPATH := $${HOME}/.netsurf/:$${NETSURFRES}:$(NETSURF_FRAMEBUFFER_RESOURCES):./frontends/framebuffer/res -- cgit v1.2.3