Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/231f026e6a518db00695b4c18c7f41b6c8698942
...commit
http://git.netsurf-browser.org/netsurf.git/commit/231f026e6a518db00695b4c18c7f41b6c8698942
...tree
http://git.netsurf-browser.org/netsurf.git/tree/231f026e6a518db00695b4c18c7f41b6c8698942
The branch, master has been updated
via 231f026e6a518db00695b4c18c7f41b6c8698942 (commit)
via d1fa6a8ee1e53aebd8d3a7baa3b27f27e71972c2 (commit)
from 9501c9e68d336f894470d45a317f9a2123dcca80 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=231f026e6a518db00695b4c18c7f41b6c8698942
commit 231f026e6a518db00695b4c18c7f41b6c8698942
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
Improve framebuffer install rule
diff --git a/Makefile b/Makefile
index f685252..f860428 100644
--- a/Makefile
+++ b/Makefile
@@ -137,6 +137,7 @@ PERL=perl
MKDIR=mkdir
TOUCH=touch
STRIP?=strip
+INSTALL?=install
SPLIT_MESSAGES=$(PERL) utils/split-messages.pl
# build verbosity
diff --git a/frontends/framebuffer/Makefile b/frontends/framebuffer/Makefile
index 9051a88..feefc1f 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 cc712e9..8def7d9 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
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=d1fa6a8ee1e53aebd8d3a7baa3b27f27e71972c2
commit d1fa6a8ee1e53aebd8d3a7baa3b27f27e71972c2
Author: Anthony J. Bentley <[email protected]>
Commit: Vincent Sanders <[email protected]>
fix feature flags for openbsd
diff --git a/frontends/framebuffer/Makefile b/frontends/framebuffer/Makefile
index a99031e..9051a88 100644
--- a/frontends/framebuffer/Makefile
+++ b/frontends/framebuffer/Makefile
@@ -54,14 +54,19 @@ LDFLAGS += -Wl,--no-whole-archive
# HOST specific feature flags
# ---------------------------------------------------------------------------
-# enable POSIX and XSI features.
-# everywhere but freebsd where the default set already has them enabled
+# enable POSIX and XSI feature flasg except:
+# - the default set on freebsd already has them enabled
+# - openbsd does not require the default source flags
ifneq ($(HOST),FreeBSD)
- CFLAGS += -D_POSIX_C_SOURCE=200809L \
- -D_XOPEN_SOURCE=700 \
- -D_BSD_SOURCE \
- -D_DEFAULT_SOURCE \
- -D_NETBSD_SOURCE
+ ifneq ($(HOST),OpenBSD)
+ CFLAGS += -D_POSIX_C_SOURCE=200809L \
+ -D_XOPEN_SOURCE=700 \
+ -D_BSD_SOURCE \
+ -D_DEFAULT_SOURCE \
+ -D_NETBSD_SOURCE
+ else
+ CFLAGS += -D_POSIX_C_SOURCE=200809L
+ endif
endif
# ----------------------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
Makefile | 1 +
frontends/framebuffer/Makefile | 32 ++++++++++++++++++-------------
frontends/framebuffer/Makefile.defaults | 4 ++--
3 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/Makefile b/Makefile
index f685252..f860428 100644
--- a/Makefile
+++ b/Makefile
@@ -137,6 +137,7 @@ PERL=perl
MKDIR=mkdir
TOUCH=touch
STRIP?=strip
+INSTALL?=install
SPLIT_MESSAGES=$(PERL) utils/split-messages.pl
# build verbosity
diff --git a/frontends/framebuffer/Makefile b/frontends/framebuffer/Makefile
index a99031e..feefc1f 100644
--- a/frontends/framebuffer/Makefile
+++ b/frontends/framebuffer/Makefile
@@ -54,14 +54,19 @@ LDFLAGS += -Wl,--no-whole-archive
# HOST specific feature flags
# ---------------------------------------------------------------------------
-# enable POSIX and XSI features.
-# everywhere but freebsd where the default set already has them enabled
+# enable POSIX and XSI feature flasg except:
+# - the default set on freebsd already has them enabled
+# - openbsd does not require the default source flags
ifneq ($(HOST),FreeBSD)
- CFLAGS += -D_POSIX_C_SOURCE=200809L \
- -D_XOPEN_SOURCE=700 \
- -D_BSD_SOURCE \
- -D_DEFAULT_SOURCE \
- -D_NETBSD_SOURCE
+ ifneq ($(HOST),OpenBSD)
+ CFLAGS += -D_POSIX_C_SOURCE=200809L \
+ -D_XOPEN_SOURCE=700 \
+ -D_BSD_SOURCE \
+ -D_DEFAULT_SOURCE \
+ -D_NETBSD_SOURCE
+ else
+ CFLAGS += -D_POSIX_C_SOURCE=200809L
+ endif
endif
# ----------------------------------------------------------------------------
@@ -202,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 cc712e9..8def7d9 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
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
