From e864997842e157172211ee0dc749590d7547b594 Mon Sep 17 00:00:00 2001 From: Daniel Silverstone Date: Sun, 22 Apr 2018 10:51:43 +0100 Subject: Fix last uses of !NetSurf outside of riscos build --- frontends/amiga/Makefile | 12 ++++++------ frontends/amiga/pkg/makereslinks | 24 ++++++++++++------------ 2 files changed, 18 insertions(+), 18 deletions(-) (limited to 'frontends/amiga') diff --git a/frontends/amiga/Makefile b/frontends/amiga/Makefile index 5089b4a46..efb19b369 100644 --- a/frontends/amiga/Makefile +++ b/frontends/amiga/Makefile @@ -68,7 +68,7 @@ package-amiga: netsurf.lha AMIGA_LANGUAGES := de en it ja nl AMIGA_PLATFORM_RESOURCES := Pointers Themes default.css default.css.info favicon.png LangNames mimetypes Resource.map splash.png AMIGA_GENERIC_RESOURCES := $(AMIGA_LANGUAGES) ca-bundle Icons -AMIGA_RESOURCES := $(addprefix $(FRONTEND_SOURCE_DIR)/resources/,$(AMIGA_PLATFORM_RESOURCES)) $(addprefix \!NetSurf/Resources/,$(AMIGA_GENERIC_RESOURCES)) +AMIGA_RESOURCES := $(addprefix $(FRONTEND_SOURCE_DIR)/resources/,$(AMIGA_PLATFORM_RESOURCES)) $(addprefix resources/,$(AMIGA_GENERIC_RESOURCES)) AMIGA_DISTRIBUTION_FILES := $(FRONTEND_SOURCE_DIR)/dist/* AMIGA_PKG_DIR := $(FRONTEND_SOURCE_DIR)/pkg AMIGA_INSTALL_TARGET_DIR := NetSurf_Amiga @@ -82,11 +82,11 @@ netsurf.lha: $(EXETARGET) $(Q)cp -rp $(AMIGA_RESOURCES) $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources $(Q)cp -rp $(AMIGA_DISTRIBUTION_FILES) $(AMIGA_INSTALL_TARGET_DIR)/NetSurf $(Q)cat resources/SearchEngines $(AMIGA_PKG_DIR)/SearchEngines >$(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/SearchEngines - $(Q)cp -p \!NetSurf/Resources/AdBlock,f79 $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/adblock.css - $(Q)cp -p \!NetSurf/Resources/CSS,f79 $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/nsdefault.css - $(Q)cp -p \!NetSurf/Resources/internal.css,f79 $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/internal.css - $(Q)cp -p \!NetSurf/Resources/Quirks,f79 $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/quirks.css - $(Q)cp -p \!NetSurf/Resources/netsurf.png,b60 $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/netsurf.png + $(Q)cp -p resources/addblock.css $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/adblock.css + $(Q)cp -p resources/default.css $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/nsdefault.css + $(Q)cp -p resources/internal.css $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/internal.css + $(Q)cp -p resources/quirks.css $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/quirks.css + $(Q)cp -p resources/netsurf.png $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/netsurf.png $(Q)cp -p $(AMIGA_PKG_DIR)/drawer.info $(AMIGA_INSTALL_TARGET_DIR)/NetSurf.info $(Q)cp -p $(AMIGA_PKG_DIR)/AutoInstall $(AMIGA_INSTALL_TARGET_DIR) ifeq ($(SUBTARGET),os3) diff --git a/frontends/amiga/pkg/makereslinks b/frontends/amiga/pkg/makereslinks index 4302dbd23..a9f7dfb94 100755 --- a/frontends/amiga/pkg/makereslinks +++ b/frontends/amiga/pkg/makereslinks @@ -3,26 +3,26 @@ failat 50 makedir Resources cd Resources -makelink AdBlock.css /!NetSurf/Resources/AdBlock,f79 soft +makelink AdBlock.css /resources/adblock.css soft makelink default.css /amiga/resources/default.css soft -makelink ca-bundle /!NetSurf/Resources/ca-bundle soft -makelink de /!NetSurf/Resources/de soft -makelink nsdefault.css /!NetSurf/Resources/CSS,f79 soft +makelink ca-bundle /resources/ca-bundle soft +makelink de /resources/de soft +makelink nsdefault.css /resources/default.css soft makelink favicon.png /amiga/resources/favicon.png soft makelink Resource.map /amiga/resources/Resource.map soft -makelink en /!NetSurf/Resources/en soft -makelink fr /!NetSurf/Resources/fr soft -makelink internal.css /!NetSurf/Resources/internal.css,f79 soft -makelink it /!NetSurf/Resources/it soft +makelink en /resources/en soft +makelink fr /resources/fr soft +makelink internal.css /resources/internal.css soft +makelink it /resources/it soft makelink LangNames /amiga/resources/LangNames soft -makelink netsurf.png /!NetSurf/Resources/netsurf.png,b60 soft -makelink nl /!NetSurf/Resources/nl soft +makelink netsurf.png /resources/netsurf.png soft +makelink nl /resources/nl soft makelink Pointers /amiga/resources/Pointers soft -makelink quirks.css /!NetSurf/Resources/Quirks,f79 soft +makelink quirks.css /resources/quirks.css soft makelink SearchEngines /amiga/resources/SearchEngines soft makelink splash.png /amiga/resources/splash.png soft makelink Themes /amiga/resources/Themes soft makelink mimetypes /amiga/resources/mimetypes soft / -makelink amiga/resources/nsdefault.css //!NetSurf/Resources/CSS,f79 soft +makelink amiga/resources/nsdefault.css //resources/default.css soft -- cgit v1.2.3