diff options
| author | Michael Drake <tlsa@netsurf-browser.org> | 2012-08-16 13:27:27 +0100 |
|---|---|---|
| committer | Michael Drake <tlsa@netsurf-browser.org> | 2012-08-16 13:27:27 +0100 |
| commit | 3e00973521c4bf641742e44cab52d33ae919a8b0 (patch) | |
| tree | 2a20b75a577f6d99409c8382412697a5de30d644 | |
| parent | a736775bbd5dbea26e84bc5fc98d35dea412494c (diff) | |
| parent | 21caff6365147b74d3941b00bfcf5edf5f1b3139 (diff) | |
| download | netsurf-3e00973521c4bf641742e44cab52d33ae919a8b0.tar.gz netsurf-3e00973521c4bf641742e44cab52d33ae919a8b0.tar.bz2 | |
Merge branch 'master' of git://git.netsurf-browser.org/netsurf
| -rw-r--r-- | amiga/Makefile.target | 32 | ||||
| -rwxr-xr-x | amiga/menu.c | 2 | ||||
| -rwxr-xr-x | amiga/pkg/AutoInstall (renamed from amiga/dist/AutoInstall) | 0 | ||||
| -rw-r--r-- | amiga/plugin_hack.c | 1 |
4 files changed, 34 insertions, 1 deletions
diff --git a/amiga/Makefile.target b/amiga/Makefile.target index f2d23bbc0..18659a8c5 100644 --- a/amiga/Makefile.target +++ b/amiga/Makefile.target @@ -90,3 +90,35 @@ S_AMIGA := $(addprefix amiga/,$(S_AMIGA)) # Note this is deliberately *not* expanded here as common and image # are not yet available SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_AMIGA) $(S_PDF) + +# ---------------------------------------------------------------------------- +# Install target +# ---------------------------------------------------------------------------- + +install-amiga: netsurf.lha + +AMIGA_LANGUAGES := de en fr it ja nl +AMIGA_PLATFORM_RESOURCES := Pointers Themes default.css default.css.info favicon.png LangNames mimetypes Resource.map SearchEngines splash.png +AMIGA_GENERIC_RESOURCES := $(AMIGA_LANGUAGES) ca-bundle +AMIGA_RESOURCES := $(addprefix amiga/resources/,$(AMIGA_PLATFORM_RESOURCES)) $(addprefix \!NetSurf/Resources/,$(AMIGA_GENERIC_RESOURCES)) +AMIGA_DISTRIBUTION_FILES := amiga/dist/* +AMIGA_INSTALL_TARGET_DIR := NetSurf_Amiga + +netsurf.lha: NetSurf + $(VQ)echo Creating netsurf.lha + $(Q)rm -rf $(AMIGA_INSTALL_TARGET_DIR) + $(Q)mkdir -p $(AMIGA_INSTALL_TARGET_DIR)/NetSurf + $(Q)cp NetSurf $(AMIGA_INSTALL_TARGET_DIR)/NetSurf + $(Q)mkdir $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources + $(Q)cp -r $(AMIGA_RESOURCES) $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources + $(Q)cp -r $(AMIGA_DISTRIBUTION_FILES) $(AMIGA_INSTALL_TARGET_DIR)/NetSurf + $(Q)cp \!NetSurf/Resources/AdBlock,f79 $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/adblock.css + $(Q)cp \!NetSurf/Resources/CSS,f79 $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/nsdefault.css + $(Q)cp \!NetSurf/Resources/internal.css,f79 $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/internal.css + $(Q)cp \!NetSurf/Resources/Quirks,f79 $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/quirks.css + $(Q)cp amiga/pkg/fitr $(AMIGA_INSTALL_TARGET_DIR)/NetSurf + $(Q)cp amiga/pkg/drawer.info $(AMIGA_INSTALL_TARGET_DIR)/NetSurf.info + $(Q)cp amiga/pkg/AutoInstall $(AMIGA_INSTALL_TARGET_DIR) + $(Q)cd $(AMIGA_INSTALL_TARGET_DIR); \ + lha a netsurf.lha NetSurf NetSurf.info AutoInstall + diff --git a/amiga/menu.c b/amiga/menu.c index 74048d5ad..408699e6e 100755 --- a/amiga/menu.c +++ b/amiga/menu.c @@ -721,7 +721,7 @@ static void ami_menu_item_project_about(struct Hook *hook, APTR window, struct I #else TDR_Arg2,"graphics.library static build", #endif - TDR_Arg4,verdate, + TDR_Arg3,verdate, TAG_DONE); free(temp2); diff --git a/amiga/dist/AutoInstall b/amiga/pkg/AutoInstall index c7ed154c9..c7ed154c9 100755 --- a/amiga/dist/AutoInstall +++ b/amiga/pkg/AutoInstall diff --git a/amiga/plugin_hack.c b/amiga/plugin_hack.c index 5fc45915e..e7ce0de13 100644 --- a/amiga/plugin_hack.c +++ b/amiga/plugin_hack.c @@ -23,6 +23,7 @@ #include "amiga/filetype.h" #include "amiga/plugin_hack.h" #include "content/content_protected.h" +#include "content/hlcache.h" #include "desktop/plotters.h" #include "render/box.h" #include "utils/log.h" |