diff options
author | Vincent Sanders <vince@kyllikki.org> | 2019-02-15 17:53:31 +0000 |
---|---|---|
committer | Vincent Sanders <vince@kyllikki.org> | 2019-02-15 17:53:31 +0000 |
commit | 231f026e6a518db00695b4c18c7f41b6c8698942 (patch) | |
tree | 41a4db7a050a036971fccbda6d514afa23933b3c /frontends | |
parent | d1fa6a8ee1e53aebd8d3a7baa3b27f27e71972c2 (diff) | |
download | netsurf-231f026e6a518db00695b4c18c7f41b6c8698942.tar.gz netsurf-231f026e6a518db00695b4c18c7f41b6c8698942.tar.bz2 |
Improve framebuffer install rule
Diffstat (limited to 'frontends')
-rw-r--r-- | frontends/framebuffer/Makefile | 13 | ||||
-rw-r--r-- | frontends/framebuffer/Makefile.defaults | 4 |
2 files changed, 9 insertions, 8 deletions
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 |