Gitweb links:

...log 
http://git.netsurf-browser.org/netsurf.git/shortlog/cc7d8d81eb59ee94bacb3297661e06f46864a3da
...commit 
http://git.netsurf-browser.org/netsurf.git/commit/cc7d8d81eb59ee94bacb3297661e06f46864a3da
...tree 
http://git.netsurf-browser.org/netsurf.git/tree/cc7d8d81eb59ee94bacb3297661e06f46864a3da

The branch, master has been updated
       via  cc7d8d81eb59ee94bacb3297661e06f46864a3da (commit)
       via  35c2cb9d089b8b86fa8820e4486f2241326830b4 (commit)
      from  62990184cd0229f8d354aac5625224c1bae79548 (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=cc7d8d81eb59ee94bacb3297661e06f46864a3da
commit cc7d8d81eb59ee94bacb3297661e06f46864a3da
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>

    update missed cocoa frontend resource locations

diff --git a/frontends/cocoa/Makefile b/frontends/cocoa/Makefile
index d3270aa..e608ca8 100644
--- a/frontends/cocoa/Makefile
+++ b/frontends/cocoa/Makefile
@@ -190,7 +190,7 @@ endif
 
 endef
 
-$(foreach lang,$(LANGUAGES),$(eval $(call make_lproj,$(lang),$(addprefix 
cocoa/res/$(lang).lproj/,$(LOCALIZED_RESOURCES)))))
+$(foreach lang,$(LANGUAGES),$(eval $(call make_lproj,$(lang),$(addprefix 
$(FRONTEND_RESOURCES_DIR)/$(lang).lproj/,$(LOCALIZED_RESOURCES)))))
 $(foreach lang,$(LANGUAGES),$(foreach xib,$(S_XIBS),$(eval $(call 
compile_xib,$(xib),$(lang)))))
 
 # ----------------------------------------------------------------------------


commitdiff 
http://git.netsurf-browser.org/netsurf.git/commit/?id=35c2cb9d089b8b86fa8820e4486f2241326830b4
commit 35c2cb9d089b8b86fa8820e4486f2241326830b4
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>

    update missed beos resource locations

diff --git a/frontends/beos/Makefile b/frontends/beos/Makefile
index 8a79fc5..3546bcf 100644
--- a/frontends/beos/Makefile
+++ b/frontends/beos/Makefile
@@ -73,11 +73,11 @@ RESOURCES = $(RSRC_BEOS)
 
 $(RDEF_IMP_BEOS): $(RDEP_BEOS)
        $(VQ)echo "     GEN: $@"
-       $(Q)n=5000; for f in $^; do echo "resource($$n,\"$${f#beos/res/}\") 
#'data' import \"$${f#beos/}\";"; n=$$(($$n+1)); done > $@
+       $(Q)n=5000; for f in $^; do echo 
"resource($$n,\"$${f#$(FRONTEND_RESOURCES_DIR)/}\") #'data' import 
\"$${f#beos/}\";"; n=$$(($$n+1)); done > $@
 
 $(RSRC_BEOS): $(RDEF_BEOS) $(RDEF_IMP_BEOS)
        $(VQ)echo "      RC: $<"
-       $(Q)$(BEOS_RC) -I beos -o $@ $^
+       $(Q)$(BEOS_RC) -I $(FRONTEND_SOURCE_DIR) -o $@ $^
 
 
 # ----------------------------------------------------------------------------


-----------------------------------------------------------------------

Summary of changes:
 frontends/beos/Makefile  |    4 ++--
 frontends/cocoa/Makefile |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontends/beos/Makefile b/frontends/beos/Makefile
index 8a79fc5..3546bcf 100644
--- a/frontends/beos/Makefile
+++ b/frontends/beos/Makefile
@@ -73,11 +73,11 @@ RESOURCES = $(RSRC_BEOS)
 
 $(RDEF_IMP_BEOS): $(RDEP_BEOS)
        $(VQ)echo "     GEN: $@"
-       $(Q)n=5000; for f in $^; do echo "resource($$n,\"$${f#beos/res/}\") 
#'data' import \"$${f#beos/}\";"; n=$$(($$n+1)); done > $@
+       $(Q)n=5000; for f in $^; do echo 
"resource($$n,\"$${f#$(FRONTEND_RESOURCES_DIR)/}\") #'data' import 
\"$${f#beos/}\";"; n=$$(($$n+1)); done > $@
 
 $(RSRC_BEOS): $(RDEF_BEOS) $(RDEF_IMP_BEOS)
        $(VQ)echo "      RC: $<"
-       $(Q)$(BEOS_RC) -I beos -o $@ $^
+       $(Q)$(BEOS_RC) -I $(FRONTEND_SOURCE_DIR) -o $@ $^
 
 
 # ----------------------------------------------------------------------------
diff --git a/frontends/cocoa/Makefile b/frontends/cocoa/Makefile
index d3270aa..e608ca8 100644
--- a/frontends/cocoa/Makefile
+++ b/frontends/cocoa/Makefile
@@ -190,7 +190,7 @@ endif
 
 endef
 
-$(foreach lang,$(LANGUAGES),$(eval $(call make_lproj,$(lang),$(addprefix 
cocoa/res/$(lang).lproj/,$(LOCALIZED_RESOURCES)))))
+$(foreach lang,$(LANGUAGES),$(eval $(call make_lproj,$(lang),$(addprefix 
$(FRONTEND_RESOURCES_DIR)/$(lang).lproj/,$(LOCALIZED_RESOURCES)))))
 $(foreach lang,$(LANGUAGES),$(foreach xib,$(S_XIBS),$(eval $(call 
compile_xib,$(xib),$(lang)))))
 
 # ----------------------------------------------------------------------------


-- 
NetSurf Browser

_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org

Reply via email to