Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/37b4e77720b6c91e8a444...
...commit
http://git.netsurf-browser.org/netsurf.git/commit/37b4e77720b6c91e8a4440c...
...tree
http://git.netsurf-browser.org/netsurf.git/tree/37b4e77720b6c91e8a4440c53...
The branch, master has been updated
via 37b4e77720b6c91e8a4440c536d4acc942d69275 (commit)
from 7b868e4287591671163efafbe46c61f5ae9ac249 (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/37b4e77720b6c91e8a4...
commit 37b4e77720b6c91e8a4440c536d4acc942d69275
Author: Ole Loots <ole(a)monochrom.net>
Commit: Ole Loots <ole(a)monochrom.net>
Copy toolbar to right location.
diff --git a/atari/Makefile.target b/atari/Makefile.target
index 9c7157e..c207eae 100644
--- a/atari/Makefile.target
+++ b/atari/Makefile.target
@@ -128,7 +128,6 @@ $(PKGNAME): $(EXETARGET)
$(Q)$(STACK) -S 256k $(EXETARGET)
$(Q)rm -rf $(ATARI_TARGET_DIR)
$(Q)rm -rf $(PKGNAME)
-# $(Q)rm -rf $(ATARI_FONT_SOURCE_DIR)
$(Q)mkdir $(ATARI_TARGET_DIR)
$(Q)mkdir $(ATARI_TARGET_DIR)doc
$(Q)mkdir $(ATARI_TARGET_DIR)download
@@ -145,7 +144,7 @@ $(PKGNAME): $(EXETARGET)
# GUI resources:
$(Q)cp $(ATARI_RES_DIR)/netsurf.rsc $(ATARI_TARGET_DIR)res/netsurf.rsc
- $(Q)cp $(ATARI_RES_DIR)/icons -R $(ATARI_TARGET_DIR)res/icons
+ $(Q)cp $(ATARI_RES_DIR)/icons/toolbar -R $(ATARI_TARGET_DIR)res/icons
$(Q)cp \!NetSurf/Resources/Icons/content.png -R $(ATARI_TARGET_DIR)res/icons/
$(Q)cp \!NetSurf/Resources/Icons/directory.png -R $(ATARI_TARGET_DIR)res/icons/dir.png
@@ -159,10 +158,6 @@ $(PKGNAME): $(EXETARGET)
$(Q)cp \!NetSurf/Resources/ca-bundle $(ATARI_TARGET_DIR)res/cabundle
# copy "Bitstream Vera" font:
-# try "cp
-# /path/to/local/copy/font.ttf /path/to/pkg/font.ttf || wget -O
-# /path/to/pkg/font.ttf
http://foo/font.ttf"
-
$(Q)cp $(ATARI_FONT_SOURCE_DIR)RELEASENOTES.TXT $(ATARI_TARGET_DIR)res/fonts/
$(Q)cp $(ATARI_FONT_SOURCE_DIR)README.TXT $(ATARI_TARGET_DIR)res/fonts/
$(Q)cp $(ATARI_FONT_SOURCE_DIR)COPYRIGHT.TXT $(ATARI_TARGET_DIR)res/fonts/
@@ -185,4 +180,3 @@ $(PKGNAME): $(EXETARGET)
# delete temporary folders
$(Q)rm -rf $(ATARI_TARGET_DIR)
-# $(Q)rm -rf $(ATARI_FONT_SOURCE_DIR)
-----------------------------------------------------------------------
Summary of changes:
atari/Makefile.target | 8 +-------
1 files changed, 1 insertions(+), 7 deletions(-)
diff --git a/atari/Makefile.target b/atari/Makefile.target
index 9c7157e..c207eae 100644
--- a/atari/Makefile.target
+++ b/atari/Makefile.target
@@ -128,7 +128,6 @@ $(PKGNAME): $(EXETARGET)
$(Q)$(STACK) -S 256k $(EXETARGET)
$(Q)rm -rf $(ATARI_TARGET_DIR)
$(Q)rm -rf $(PKGNAME)
-# $(Q)rm -rf $(ATARI_FONT_SOURCE_DIR)
$(Q)mkdir $(ATARI_TARGET_DIR)
$(Q)mkdir $(ATARI_TARGET_DIR)doc
$(Q)mkdir $(ATARI_TARGET_DIR)download
@@ -145,7 +144,7 @@ $(PKGNAME): $(EXETARGET)
# GUI resources:
$(Q)cp $(ATARI_RES_DIR)/netsurf.rsc $(ATARI_TARGET_DIR)res/netsurf.rsc
- $(Q)cp $(ATARI_RES_DIR)/icons -R $(ATARI_TARGET_DIR)res/icons
+ $(Q)cp $(ATARI_RES_DIR)/icons/toolbar -R $(ATARI_TARGET_DIR)res/icons
$(Q)cp \!NetSurf/Resources/Icons/content.png -R $(ATARI_TARGET_DIR)res/icons/
$(Q)cp \!NetSurf/Resources/Icons/directory.png -R $(ATARI_TARGET_DIR)res/icons/dir.png
@@ -159,10 +158,6 @@ $(PKGNAME): $(EXETARGET)
$(Q)cp \!NetSurf/Resources/ca-bundle $(ATARI_TARGET_DIR)res/cabundle
# copy "Bitstream Vera" font:
-# try "cp
-# /path/to/local/copy/font.ttf /path/to/pkg/font.ttf || wget -O
-# /path/to/pkg/font.ttf
http://foo/font.ttf"
-
$(Q)cp $(ATARI_FONT_SOURCE_DIR)RELEASENOTES.TXT $(ATARI_TARGET_DIR)res/fonts/
$(Q)cp $(ATARI_FONT_SOURCE_DIR)README.TXT $(ATARI_TARGET_DIR)res/fonts/
$(Q)cp $(ATARI_FONT_SOURCE_DIR)COPYRIGHT.TXT $(ATARI_TARGET_DIR)res/fonts/
@@ -185,4 +180,3 @@ $(PKGNAME): $(EXETARGET)
# delete temporary folders
$(Q)rm -rf $(ATARI_TARGET_DIR)
-# $(Q)rm -rf $(ATARI_FONT_SOURCE_DIR)
--
NetSurf Browser