netsurf: branch master updated. e85284d7d15f8f64dc8074e57526ef100a9793bf

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/e85284d7d15f8f64dc807... ...commit http://git.netsurf-browser.org/netsurf.git/commit/e85284d7d15f8f64dc8074e... ...tree http://git.netsurf-browser.org/netsurf.git/tree/e85284d7d15f8f64dc8074e57... The branch, master has been updated via e85284d7d15f8f64dc8074e57526ef100a9793bf (commit) via 887a2ca18638755f74594913b7e07ac41b27e8a6 (commit) from c67187079e034ad2a0fe41521b9068f02a6f103d (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/commitdiff/e85284d7d15f8f64dc8... commit e85284d7d15f8f64dc8074e57526ef100a9793bf Merge: 887a2ca c671870 Author: Ole Loots <ole(a)monochrom.net&gt; Commit: Ole Loots <ole(a)monochrom.net&gt; Merge branch 'master' of git://git.netsurf-browser.org/netsurf commitdiff http://git.netsurf-browser.org/netsurf.git/commitdiff/887a2ca18638755f745... commit 887a2ca18638755f74594913b7e07ac41b27e8a6 Author: Ole Loots <ole(a)monochrom.net&gt; Commit: Ole Loots <ole(a)monochrom.net&gt; Added and use PRGSUFFIX to configure executable name. diff --git a/atari/Makefile.target b/atari/Makefile.target index 259f5b6..cbd8e6f 100644 --- a/atari/Makefile.target +++ b/atari/Makefile.target @@ -3,13 +3,19 @@ # ---------------------------------------------------------------------------- ifeq ($(ATARI_ARCH),68020-60) +PRGSUFFIX := 000.app +endif + +ifeq ($(ATARI_ARCH),68020-60) CFLAGS += -m68020-60 LDFLAGS += -m68020-60 +PRGSUFFIX := 020.app endif ifeq ($(ATARI_ARCH),5475) CFLAGS += -mcpu=5475 LDFLAGS += -mcpu=5475 +PRGSUFFIX := v4e.app endif # non-pkgconfig components @@ -71,6 +77,6 @@ S_ATARI := $(addprefix atari/,$(S_ATARI)) # Note this is deliberately *not* expanded here as common and image # are not yet available SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_ATARI) -EXETARGET := ns$(SUBTARGET).prg +EXETARGET := ns$(SUBTARGET)$(PRGSUFFIX) ----------------------------------------------------------------------- Summary of changes: atari/Makefile.target | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/atari/Makefile.target b/atari/Makefile.target index 259f5b6..cbd8e6f 100644 --- a/atari/Makefile.target +++ b/atari/Makefile.target @@ -3,13 +3,19 @@ # ---------------------------------------------------------------------------- ifeq ($(ATARI_ARCH),68020-60) +PRGSUFFIX := 000.app +endif + +ifeq ($(ATARI_ARCH),68020-60) CFLAGS += -m68020-60 LDFLAGS += -m68020-60 +PRGSUFFIX := 020.app endif ifeq ($(ATARI_ARCH),5475) CFLAGS += -mcpu=5475 LDFLAGS += -mcpu=5475 +PRGSUFFIX := v4e.app endif # non-pkgconfig components @@ -71,6 +77,6 @@ S_ATARI := $(addprefix atari/,$(S_ATARI)) # Note this is deliberately *not* expanded here as common and image # are not yet available SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_ATARI) -EXETARGET := ns$(SUBTARGET).prg +EXETARGET := ns$(SUBTARGET)$(PRGSUFFIX) -- NetSurf Browser