From d1bd0c747d98bbd32e353a9d69f24a5f6eedf453 Mon Sep 17 00:00:00 2001 From: mazze Date: Mon, 28 Oct 2013 07:59:49 +0000 Subject: [PATCH] Replaced deprecated variables CONTRIBDIR, BINDIR and LIBDIR by AROS_CONTRIB, AROSDIR AND AROS_LIB. git-svn-id: https://svn.aros.org/svn/aros/trunk/contrib@48342 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- Demo/BlackHole/mmakefile.src | 2 +- Demo/DawaFire/icons/mmakefile.src | 2 +- Demo/DawaFire/mmakefile.src | 2 +- Demo/FTunnel/mmakefile.src | 2 +- Demo/Firework/icons/mmakefile.src | 2 +- Demo/Firework/mmakefile.src | 2 +- Demo/Flamme/icons/mmakefile.src | 2 +- Demo/Flamme/mmakefile.src | 2 +- Demo/GLExcess/mmakefile.src | 6 +++--- Demo/Galaxy/icons/mmakefile.src | 2 +- Demo/Galaxy/mmakefile.src | 2 +- Demo/InfPlane/icons/mmakefile.src | 2 +- Demo/InfPlane/mmakefile.src | 2 +- Demo/Kitty/icons/mmakefile.src | 2 +- Demo/Kitty/mmakefile.src | 2 +- Demo/Mesa/images/mmakefile.src | 2 +- Demo/Mesa/mmakefile.src | 2 +- Demo/Metaballs/icons/mmakefile.src | 2 +- Demo/Metaballs/mmakefile.src | 2 +- Demo/NewVox/icons/mmakefile.src | 2 +- Demo/NewVox/mmakefile.src | 2 +- Demo/Parallax/icons/mmakefile.src | 2 +- Demo/Parallax/mmakefile.src | 2 +- Demo/PowerZoom/mmakefile.src | 2 +- Demo/RubberStrings/icons/mmakefile.src | 2 +- Demo/RubberStrings/mmakefile.src | 2 +- Demo/Tunnel/icons/mmakefile.src | 2 +- Demo/Tunnel/mmakefile.src | 2 +- Demo/Voxel/icons/mmakefile.src | 2 +- Demo/Voxel/mmakefile.src | 2 +- Demo/kdp/mmakefile.src | 2 +- Demo/mmakefile.src | 2 +- DiskSpeed/icons/mmakefile.src | 2 +- DiskSpeed/mmakefile.src | 2 +- FryingPan/DTLib/mmakefile.src | 2 +- FryingPan/Data/mmakefile.src | 2 +- FryingPan/Expat/mmakefile.src | 2 +- FryingPan/FP/Engine/mmakefile.src | 2 +- FryingPan/FP/GUI-MUI/mmakefile.src | 2 +- FryingPan/FP/mmakefile.src | 2 +- FryingPan/ISOBuilder/mmakefile.src | 2 +- FryingPan/Optical/mmakefile.src | 2 +- Games/Bomber/mmakefile.src | 2 +- Games/Doom/icons/mmakefile.src | 2 +- Games/Doom/mmakefile.src | 2 +- Games/Kiel/Jump/mmakefile.src | 2 +- Games/Kiel/Mine/catalogs/mmakefile.src | 2 +- Games/Kiel/Mine/mmakefile.src | 2 +- Games/Kiel/Quad/mmakefile.src | 2 +- Games/Kiel/Rotate/mmakefile.src | 2 +- Games/Kiel/Wumpus/catalogs/mmakefile.src | 2 +- Games/Kiel/Wumpus/mmakefile.src | 2 +- Games/Moria3D/Source/mmakefile.src | 4 ++-- Games/Moria3D/mmakefile.src | 2 +- Games/Quake/mmakefile.src | 12 ++++++------ Games/XInvaders3D/mmakefile.src | 2 +- Games/cxhextris/mmakefile.src | 2 +- Games/lbreakout2/mmakefile.src | 2 +- Games/spout/mmakefile.src | 2 +- Games/wumpus/mmakefile.src | 2 +- Misc/Bench/Dhrystone/mmakefile.src | 2 +- Misc/DDemo7/mmakefile.src | 2 +- Misc/Linie12/mmakefile.src | 2 +- Misc/SWitch/mmakefile.src | 2 +- Misc/SortCopy/mmakefile.src | 2 +- Misc/berger/mmakefile.src | 2 +- Misc/berger/samples/mmakefile | 2 +- MultiMedia/AMP2/mmakefile.src | 2 +- MultiMedia/AMP2/plugin/a52/mmakefile.src | 2 +- MultiMedia/AMP2/plugin/cvid/mmakefile.src | 2 +- MultiMedia/AMP2/plugin/h263/mmakefile.src | 2 +- MultiMedia/AMP2/plugin/ima4/mmakefile.src | 2 +- MultiMedia/AMP2/plugin/mace/mmakefile.src | 2 +- MultiMedia/AMP2/plugin/mpega/mmakefile.src | 2 +- MultiMedia/AMP2/plugin/mpegv/mmakefile.src | 2 +- MultiMedia/AMP2/plugin/mpegvlo/mmakefile.src | 2 +- MultiMedia/AMP2/plugin/msvc/mmakefile.src | 2 +- MultiMedia/AMP2/plugin/pcm/mmakefile.src | 2 +- MultiMedia/AMP2/plugin/real/mmakefile.src | 2 +- MultiMedia/AMP2/plugin/svq1/mmakefile.src | 2 +- MultiMedia/AMP2/plugin/twos/mmakefile.src | 2 +- MultiMedia/AMP2/plugin/xanim/mmakefile.src | 2 +- MultiMedia/radium/mmakefile.src | 6 +++--- Networking/Apps/AiRcOS/catalogs/mmakefile.src | 2 +- Networking/Apps/AiRcOS/icons/mmakefile.src | 2 +- Networking/Apps/AiRcOS/mmakefile.src | 2 +- Networking/Apps/MarranoFTP/mmakefile.src | 2 +- Networking/Apps/OWB/catalogs/mmakefile.src | 2 +- Networking/Apps/OWB/mmakefile.src | 2 +- Networking/Apps/amosaic/src/mmakefile.src | 2 +- Networking/Apps/telnet/ttel/mmakefile.src | 2 +- Networking/Apps/tinyirc122/mmakefile.src | 2 +- Networking/Developer/Tests/basics/mmakefile.src | 2 +- Networking/Developer/Tests/mmakefile.src | 2 +- Networking/Stacks/lwip/lwip/proj/amigaos/mmakefile.src | 2 +- Networking/Utils/SANAUtil/mmakefile.src | 4 ++-- Networking/Utils/daytime/mmakefile.src | 2 +- aminet/GadgetTest/mmakefile.src | 2 +- aminet/comm/amitcp/mmakefile.src | 2 +- aminet/comm/term/MicroTerm/mmakefile.src | 2 +- aminet/comm/term/TinyTerminal/mmakefile.src | 2 +- aminet/comm/term/amigaterm/mmakefile.src | 2 +- aminet/comm/term/term/Extras/Source/mmakefile.src | 2 +- aminet/comm/term/termLite/mmakefile.src | 2 +- aminet/comm/term/xemlibs/xem/mmakefile.src | 2 +- aminet/dev/basic/bwBASIC/mmakefile.src | 2 +- aminet/dev/src/HexDump/mmakefile.src | 2 +- aminet/dev/src/RABLe/compile/mmakefile.src | 2 +- aminet/disk/misc/Mtools-2.0.7/mmakefile.src | 2 +- aminet/disk/moni/filex/locale/mmakefile.src | 2 +- aminet/disk/moni/filex/mmakefile.src | 2 +- aminet/games/board/Backgammon/mmakefile.src | 2 +- aminet/games/shoot/inv/mmakefile.src | 2 +- aminet/games/think/amichess/mmakefile.src | 2 +- aminet/games/think/amichess/src/mmakefile.src | 2 +- aminet/games/think/lazymines/catalogs/mmakefile.src | 2 +- aminet/games/think/lazymines/mmakefile.src | 2 +- aminet/games/think/muimine/Images/mmakefile.src | 2 +- aminet/games/think/muimine/mmakefile.src | 2 +- aminet/games/think/newmastermind/catalogs/mmakefile.src | 2 +- aminet/games/think/newmastermind/mmakefile.src | 2 +- aminet/games/think/soliton/common/mmakefile.src | 2 +- aminet/games/think/soliton/locale/mmakefile.src | 2 +- aminet/games/think/soliton/releasefiles/mmakefile.src | 2 +- aminet/games/think/yahzee/catalogs/mmakefile.src | 2 +- aminet/games/think/yahzee/mmakefile.src | 2 +- aminet/mus/midi/CAMD_Toolkit/Fireworks/Source/mmakefile.src | 2 +- aminet/mus/midi/CAMD_Toolkit/PlayMF/Source/mmakefile.src | 2 +- aminet/text/edit/xdme/mmakefile.src | 2 +- aminet/text/misc/Typeface/catalogs/mmakefile.src | 2 +- aminet/text/misc/Typeface/mmakefile.src | 2 +- aminet/util/arc/bzip2/mmakefile.src | 2 +- aminet/util/arc/lha/mmakefile.src | 2 +- aminet/util/arc/testdms/mmakefile.src | 2 +- aminet/util/arc/unace/mmakefile.src | 2 +- aminet/util/arc/unarj/mmakefile.src | 2 +- aminet/util/arc/undms/mmakefile.src | 2 +- aminet/util/arc/unlzx/mmakefile.src | 2 +- aminet/util/arc/unrar/mmakefile.src | 2 +- aminet/util/arc/unshar/mmakefile.src | 2 +- aminet/util/arc/unsit/mmakefile.src | 2 +- aminet/util/arc/untar/mmakefile.src | 2 +- aminet/util/arc/untgz/mmakefile.src | 2 +- aminet/util/arc/zoo/mmakefile.src | 2 +- aminet/util/cli/sploiner/mmakefile.src | 2 +- aminet/util/dir/filemaster/catalogs/mmakefile.src | 2 +- aminet/util/dir/filemaster/mmakefile.src | 2 +- aminet/util/misc/reqattack/mmakefile.src | 2 +- aminet/util/moni/SnoopDos/mmakefile.src | 2 +- aminet/util/moni/memspeed/mmakefile.src | 2 +- aminet/util/moni/nbench/mmakefile.src | 2 +- aminet/util/pack/ppunpack/mmakefile.src | 2 +- aminet/util/pack/unhqx/mmakefile.src | 2 +- aminet/util/pack/unsqsh/mmakefile.src | 2 +- aminet/util/wb/modifyicon/mmakefile.src | 2 +- bgui/gadgets/mmakefile.src | 3 +-- bgui/make.cfg | 2 +- bgui/mmakefile.src | 2 +- bgui/workbench/tools/mmakefile.src | 2 +- development/build/makedepend/mmakefile.src | 2 +- development/compilers/false/mmakefile.src | 2 +- development/compilers/lcc/cpp/mmakefile.src | 2 +- development/compilers/lcc/etc/mmakefile.src | 2 +- development/compilers/lua/lsqlite3/mmakefile.src | 2 +- development/compilers/lua/lua-xmlreader-0.1/mmakefile.src | 2 +- development/compilers/lua/luafilesystem/mmakefile.src | 2 +- development/compilers/lua/mmakefile.src | 2 +- development/compilers/lua/src/mmakefile.src | 2 +- development/compilers/nasm/mmakefile.src | 2 +- development/compilers/tcc-0.9.19/mmakefile.src | 8 ++++---- development/compilers/tcc/mmakefile.src | 2 +- development/compilers/vbcc/aros/mmakefile.src | 2 +- development/compilers/vbcc/datatypes/mmakefile.src | 2 +- development/compilers/vbcc/frontend/mmakefile.src | 2 +- development/compilers/vbcc/mmakefile.src | 2 +- development/compilers/vbcc/vprof/mmakefile.src | 2 +- development/mmakefile.src | 2 +- dopus/make.cfg | 2 +- emu/e-uae/mmakefile.src | 2 +- emu/mame/mmakefile.src | 2 +- emu/uae/src/mmakefile.src | 2 +- fish/304_clines/mmakefile.src | 2 +- fish/304_lines/mmakefile.src | 2 +- fish/362_rubik/mmakefile.src | 2 +- fish/371_fractal/mmakefile.src | 2 +- fish/aroach/mmakefile.src | 2 +- fish/asimplex/mmakefile.src | 2 +- fish/bezier/bouncing/mmakefile.src | 2 +- fish/bezier/cubic/mmakefile.src | 2 +- fish/bezier/orig/mmakefile.src | 2 +- fish/cfn/mmakefile.src | 4 ++-- fish/cube/mmakefile.src | 2 +- fish/egypt/mmakefile.src | 2 +- fish/eval/mmakefile.src | 2 +- fish/find/mmakefile.src | 2 +- fish/fiveinline/mmakefile.src | 2 +- fish/gooddouble/mmakefile.src | 2 +- fish/grep/mmakefile.src | 2 +- fish/henon/mmakefile.src | 2 +- fish/icalc/mmakefile.src | 2 +- fish/icon2c/mmakefile.src | 2 +- fish/input/mmakefile.src | 2 +- fish/layers/mmakefile.src | 2 +- fish/lines/mmakefile.src | 2 +- fish/lotto/mmakefile.src | 2 +- fish/lyr-o-mat/mmakefile.src | 2 +- fish/mandel/mmakefile.src | 2 +- fish/memeter/mmakefile.src | 2 +- fish/memomaster/mmakefile.src | 2 +- fish/memsnap/mmakefile.src | 2 +- fish/microemacs/mmakefile.src | 2 +- fish/mosaic/mmakefile.src | 2 +- fish/rubik/mmakefile.src | 2 +- fish/screenzap/mmakefile.src | 2 +- fish/shuffle/mmakefile.src | 2 +- fish/snowfall/mmakefile.src | 2 +- fish/sunmaze/mmakefile.src | 2 +- fish/surf/mmakefile.src | 2 +- fish/touch/mmakefile.src | 2 +- fish/tree/mmakefile.src | 2 +- fish/watchman/mmakefile.src | 2 +- fish/windowtool/mmakefile.src | 2 +- fish/worldtime/mmakefile.src | 4 ++-- fish/yachtc/mmakefile.src | 2 +- gc/mmakefile.src | 2 +- gfx/XaoS/icons/mmakefile.src | 2 +- gfx/XaoS/mmakefile.src | 2 +- gfx/XaoS/src/mmakefile.src | 6 +++--- gfx/mysticube/mmakefile.src | 2 +- gfx/mysticview/src/mmakefile.src | 2 +- gfx/povray/mmakefile.src | 2 +- gnu/make.cfg | 2 +- .../Gorilla/Icons/Medium/AROS/Extras/DOpus/mmakefile.src | 2 +- .../Gorilla/Icons/Medium/AROS/Extras/Demos/mmakefile.src | 2 +- .../Icons/Medium/AROS/Extras/Development/Lua/mmakefile.src | 2 +- .../Icons/Medium/AROS/Extras/Development/mmakefile.src | 2 +- .../Gorilla/Icons/Medium/AROS/Extras/Emu/E-UAE/mmakefile.src | 2 +- .../Gorilla/Icons/Medium/AROS/Extras/Emu/UAE/mmakefile.src | 2 +- .../Gorilla/Icons/Medium/AROS/Extras/Emu/mmakefile.src | 2 +- .../Gorilla/Icons/Medium/AROS/Extras/FryingPan/mmakefile.src | 2 +- .../Gorilla/Icons/Medium/AROS/Extras/Games/mmakefile.src | 2 +- .../Icons/Medium/AROS/Extras/MultiMedia/AMP2/mmakefile.src | 2 +- .../Icons/Medium/AROS/Extras/MultiMedia/Gfx/mmakefile.src | 2 +- .../Icons/Medium/AROS/Extras/MultiMedia/mmakefile.src | 2 +- .../Medium/AROS/Extras/Networking/Apps/AiRcOS/mmakefile.src | 2 +- .../Medium/AROS/Extras/Networking/Apps/OWB/mmakefile.src | 2 +- .../Icons/Medium/AROS/Extras/Networking/Apps/mmakefile.src | 6 +++--- .../Icons/Medium/AROS/Extras/Networking/mmakefile.src | 2 +- .../Icons/Medium/AROS/Extras/Office/MUIbase/mmakefile.src | 2 +- .../Gorilla/Icons/Medium/AROS/Extras/Office/mmakefile.src | 2 +- .../IconSets/Gorilla/Icons/Medium/AROS/Extras/mmakefile.src | 2 +- mui/classes/mailtext/mmakefile.src | 2 +- mui/classes/mailtext/s/mmakefile.src | 2 +- mui/classes/popph/s/mmakefile.src | 2 +- mui/classes/thebar/aros/s/mmakefile.src | 2 +- mui/classes/toolbar/Demos/mmakefile.src | 2 +- mui/classes/toolbar/Developer/C/Examples/mmakefile.src | 2 +- mui/classes/toolbar/Source/Toolbar_mcc/mmakefile.src | 2 +- mui/classes/toolbar/Source/Toolbar_mcp/mmakefile.src | 2 +- mui/classes/toolbar/s/mmakefile.src | 2 +- mui/classes/urltext/s/mmakefile.src | 2 +- mui/madmatrix/mmakefile.src | 2 +- regina/demo/mmakefile | 2 +- regina/mmakefile.src | 2 +- regina/trip/mmakefile.src | 2 +- rexx/progs/mmakefile.src | 2 +- rexx/src/mmakefile.src | 2 +- scout/source/tbLib/mmakefile.src | 2 +- sqlite3/mmakefile.src | 12 ++++++------ 269 files changed, 294 insertions(+), 295 deletions(-) diff --git a/Demo/BlackHole/mmakefile.src b/Demo/BlackHole/mmakefile.src index fb253e06d..38fa9f4bb 100644 --- a/Demo/BlackHole/mmakefile.src +++ b/Demo/BlackHole/mmakefile.src @@ -1,7 +1,7 @@ include $(TOP)/config/make.cfg %build_prog mmake=demo-blackhole \ - progname=blackhole targetdir=$(CONTRIBDIR)/Demos/BlackHole \ + progname=blackhole targetdir=$(AROS_CONTRIB)/Demos/BlackHole \ files=blackhole diff --git a/Demo/DawaFire/icons/mmakefile.src b/Demo/DawaFire/icons/mmakefile.src index cfa7ed25b..ec4f431f3 100644 --- a/Demo/DawaFire/icons/mmakefile.src +++ b/Demo/DawaFire/icons/mmakefile.src @@ -1,6 +1,6 @@ include $(TOP)/config/make.cfg -DESTDIR := $(CONTRIBDIR)/Demos/DawaFire +DESTDIR := $(AROS_CONTRIB)/Demos/DawaFire %build_icons mmake=demo-dawafire-icons icons=DawaFire dir=$(DESTDIR) diff --git a/Demo/DawaFire/mmakefile.src b/Demo/DawaFire/mmakefile.src index 8d7ae3b23..fd1fc4fff 100644 --- a/Demo/DawaFire/mmakefile.src +++ b/Demo/DawaFire/mmakefile.src @@ -2,7 +2,7 @@ include $(TOP)/config/make.cfg #MM demo-dawafire : demo-dawafire-icons -DESTDIR := $(CONTRIBDIR)/Demos/DawaFire +DESTDIR := $(AROS_CONTRIB)/Demos/DawaFire %build_prog mmake=demo-dawafire \ progname=DawaFire targetdir=$(DESTDIR) \ diff --git a/Demo/FTunnel/mmakefile.src b/Demo/FTunnel/mmakefile.src index 00ccf19d9..4da1f0a62 100644 --- a/Demo/FTunnel/mmakefile.src +++ b/Demo/FTunnel/mmakefile.src @@ -1,6 +1,6 @@ include $(TOP)/config/make.cfg -DESTDIR := $(CONTRIBDIR)/Demos/FTunnel +DESTDIR := $(AROS_CONTRIB)/Demos/FTunnel #MM demo-ftunnel : demo-ftunnel-data diff --git a/Demo/Firework/icons/mmakefile.src b/Demo/Firework/icons/mmakefile.src index a70ab78aa..28b10851c 100644 --- a/Demo/Firework/icons/mmakefile.src +++ b/Demo/Firework/icons/mmakefile.src @@ -1,6 +1,6 @@ include $(TOP)/config/make.cfg -DESTDIR := $(CONTRIBDIR)/Demos/Firework +DESTDIR := $(AROS_CONTRIB)/Demos/Firework %build_icons mmake=demo-firework-icons icons=Firework dir=$(DESTDIR) diff --git a/Demo/Firework/mmakefile.src b/Demo/Firework/mmakefile.src index 40f17ea0a..ace282cdf 100644 --- a/Demo/Firework/mmakefile.src +++ b/Demo/Firework/mmakefile.src @@ -2,7 +2,7 @@ include $(TOP)/config/make.cfg #MM demo-firework : demo-firework-icons -DESTDIR := $(CONTRIBDIR)/Demos/Firework +DESTDIR := $(AROS_CONTRIB)/Demos/Firework %build_prog mmake=demo-firework \ progname=Firework targetdir=$(DESTDIR) \ diff --git a/Demo/Flamme/icons/mmakefile.src b/Demo/Flamme/icons/mmakefile.src index b60780895..dc2512ac5 100644 --- a/Demo/Flamme/icons/mmakefile.src +++ b/Demo/Flamme/icons/mmakefile.src @@ -1,6 +1,6 @@ include $(TOP)/config/make.cfg -DESTDIR := $(CONTRIBDIR)/Demos/Flamme +DESTDIR := $(AROS_CONTRIB)/Demos/Flamme %build_icons mmake=demo-flamme-icons icons=Flamme dir=$(DESTDIR) diff --git a/Demo/Flamme/mmakefile.src b/Demo/Flamme/mmakefile.src index 121196e70..bac901c53 100644 --- a/Demo/Flamme/mmakefile.src +++ b/Demo/Flamme/mmakefile.src @@ -2,7 +2,7 @@ include $(TOP)/config/make.cfg #MM demo-flamme : demo-flamme-icons -DESTDIR := $(CONTRIBDIR)/Demos/Flamme +DESTDIR := $(AROS_CONTRIB)/Demos/Flamme %build_prog mmake=demo-flamme \ progname=Flamme targetdir=$(DESTDIR) \ diff --git a/Demo/GLExcess/mmakefile.src b/Demo/GLExcess/mmakefile.src index 84ed5560f..af7ceaa20 100644 --- a/Demo/GLExcess/mmakefile.src +++ b/Demo/GLExcess/mmakefile.src @@ -52,16 +52,16 @@ mesa-demos-glexcess-cpp : mesa-demos-glexcess-cpp-directories-setup $(GLEXCESS_S #MM mesa-demos-glexcess-cpp-directories-setup : -%mkdirs_q dirs="$(GENDIR)/$(CURDIR) $(CONTRIBDIR)/Demos/Mesa/GLExcess" +%mkdirs_q dirs="$(GENDIR)/$(CURDIR) $(AROS_CONTRIB)/Demos/Mesa/GLExcess" USER_LDFLAGS := -L$(AROS_LIB) #MM mesa-demos-glexcess : -%link_q cmd=$(TARGET_CXX) from="$(addsuffix .o,$(addprefix $(GENDIR)/$(CURDIR)/,$(notdir $(GLEXCESS_SOURCES))))" to=$(CONTRIBDIR)/Demos/Mesa/GLExcess/GLExcess libs="-lglut -lGL -lGLU" +%link_q cmd=$(TARGET_CXX) from="$(addsuffix .o,$(addprefix $(GENDIR)/$(CURDIR)/,$(notdir $(GLEXCESS_SOURCES))))" to=$(AROS_CONTRIB)/Demos/Mesa/GLExcess/GLExcess libs="-lglut -lGL -lGLU" #MM mesa-demos-glexcess-copyfiles : -%copy_dir_recursive mmake=mesa-demos-glexcess-copyfiles src=data dst="$(GENDIR)/$(CURDIR) $(CONTRIBDIR)/Demos/Mesa/GLExcess/data" +%copy_dir_recursive mmake=mesa-demos-glexcess-copyfiles src=data dst="$(GENDIR)/$(CURDIR) $(AROS_CONTRIB)/Demos/Mesa/GLExcess/data" %common diff --git a/Demo/Galaxy/icons/mmakefile.src b/Demo/Galaxy/icons/mmakefile.src index befcc580a..1771daaf7 100644 --- a/Demo/Galaxy/icons/mmakefile.src +++ b/Demo/Galaxy/icons/mmakefile.src @@ -1,6 +1,6 @@ include $(TOP)/config/make.cfg -DESTDIR := $(CONTRIBDIR)/Demos/Galaxy +DESTDIR := $(AROS_CONTRIB)/Demos/Galaxy %build_icons mmake=demo-galaxy-icons icons=Galaxy dir=$(DESTDIR) diff --git a/Demo/Galaxy/mmakefile.src b/Demo/Galaxy/mmakefile.src index 71150be4d..ee4c24b4c 100644 --- a/Demo/Galaxy/mmakefile.src +++ b/Demo/Galaxy/mmakefile.src @@ -5,7 +5,7 @@ include $(TOP)/config/make.cfg #MM demo-galaxy-x86_64 : demo-galaxy-common #MM- demo-galaxy-common : demo-galaxy-icons -DESTDIR := $(CONTRIBDIR)/Demos/Galaxy +DESTDIR := $(AROS_CONTRIB)/Demos/Galaxy %build_prog mmake=demo-galaxy-i386 \ progname=Galaxy targetdir=$(DESTDIR) \ diff --git a/Demo/InfPlane/icons/mmakefile.src b/Demo/InfPlane/icons/mmakefile.src index 4165a821e..4a89dc2fe 100644 --- a/Demo/InfPlane/icons/mmakefile.src +++ b/Demo/InfPlane/icons/mmakefile.src @@ -1,6 +1,6 @@ include $(TOP)/config/make.cfg -DESTDIR := $(CONTRIBDIR)/Demos/InfPlane +DESTDIR := $(AROS_CONTRIB)/Demos/InfPlane %build_icons mmake=demo-infplane-icons icons=InfPlane dir=$(DESTDIR) diff --git a/Demo/InfPlane/mmakefile.src b/Demo/InfPlane/mmakefile.src index f78d48287..0872cf3b3 100644 --- a/Demo/InfPlane/mmakefile.src +++ b/Demo/InfPlane/mmakefile.src @@ -8,7 +8,7 @@ include $(TOP)/config/make.cfg #MM- demo-infplane-common : demo-infplane-icons demo-infplane-data -DESTDIR := $(CONTRIBDIR)/Demos/InfPlane +DESTDIR := $(AROS_CONTRIB)/Demos/InfPlane %build_prog mmake=demo-infplane-i386 \ progname=InfPlane targetdir=$(DESTDIR) \ diff --git a/Demo/Kitty/icons/mmakefile.src b/Demo/Kitty/icons/mmakefile.src index 7b834ceaa..f56c60da5 100644 --- a/Demo/Kitty/icons/mmakefile.src +++ b/Demo/Kitty/icons/mmakefile.src @@ -1,6 +1,6 @@ include $(TOP)/config/make.cfg -EXEDIR := $(CONTRIBDIR)/Demos/Kitty +EXEDIR := $(AROS_CONTRIB)/Demos/Kitty %build_icons mmake=demo-kitty-icons icons=Kitty dir=$(EXEDIR) diff --git a/Demo/Kitty/mmakefile.src b/Demo/Kitty/mmakefile.src index e30b6499e..0a6517697 100644 --- a/Demo/Kitty/mmakefile.src +++ b/Demo/Kitty/mmakefile.src @@ -5,7 +5,7 @@ include $(TOP)/config/make.cfg FILES := main -EXEDIR := $(CONTRIBDIR)/Demos/Kitty +EXEDIR := $(AROS_CONTRIB)/Demos/Kitty #MM demo-kitty : includes linklibs demo-kitty-extra demo-kitty-icons diff --git a/Demo/Mesa/images/mmakefile.src b/Demo/Mesa/images/mmakefile.src index 4e41dffca..462c47d60 100644 --- a/Demo/Mesa/images/mmakefile.src +++ b/Demo/Mesa/images/mmakefile.src @@ -3,7 +3,7 @@ include $(TOP)/config/make.cfg -IMGDIR := $(CONTRIBDIR)/Demos/Mesa/images +IMGDIR := $(AROS_CONTRIB)/Demos/Mesa/images %copy_dir_recursive mmake=demo-mesa-images dst=$(IMGDIR) diff --git a/Demo/Mesa/mmakefile.src b/Demo/Mesa/mmakefile.src index 5321b2fef..8aec42ea0 100644 --- a/Demo/Mesa/mmakefile.src +++ b/Demo/Mesa/mmakefile.src @@ -13,7 +13,7 @@ FILES := bounce \ spectex \ eglgears \ -EXEDIR := $(CONTRIBDIR)/Demos/Mesa +EXEDIR := $(AROS_CONTRIB)/Demos/Mesa #MM- demo-mesa-prerequisites : workbench-libs-mesa workbench-libs-glu \ #MM contrib-gfx-libs-glut demo-mesa-images contrib-gfx-libs-eglut \ diff --git a/Demo/Metaballs/icons/mmakefile.src b/Demo/Metaballs/icons/mmakefile.src index 27368b3d0..e7085694b 100644 --- a/Demo/Metaballs/icons/mmakefile.src +++ b/Demo/Metaballs/icons/mmakefile.src @@ -1,6 +1,6 @@ include $(TOP)/config/make.cfg -DESTDIR := $(CONTRIBDIR)/Demos/Metaballs +DESTDIR := $(AROS_CONTRIB)/Demos/Metaballs %build_icons mmake=demo-metaballs-icons icons=Metaballs dir=$(DESTDIR) diff --git a/Demo/Metaballs/mmakefile.src b/Demo/Metaballs/mmakefile.src index 5956fe6d5..3ddb9c16e 100644 --- a/Demo/Metaballs/mmakefile.src +++ b/Demo/Metaballs/mmakefile.src @@ -2,7 +2,7 @@ include $(TOP)/config/make.cfg #MM demo-metaballs : demo-metaballs-icons -DESTDIR := $(CONTRIBDIR)/Demos/Metaballs +DESTDIR := $(AROS_CONTRIB)/Demos/Metaballs %build_prog mmake=demo-metaballs \ progname=Metaballs targetdir=$(DESTDIR) \ diff --git a/Demo/NewVox/icons/mmakefile.src b/Demo/NewVox/icons/mmakefile.src index 97294bb5b..d99eaf737 100644 --- a/Demo/NewVox/icons/mmakefile.src +++ b/Demo/NewVox/icons/mmakefile.src @@ -1,6 +1,6 @@ include $(TOP)/config/make.cfg -DESTDIR := $(CONTRIBDIR)/Demos/NewVox +DESTDIR := $(AROS_CONTRIB)/Demos/NewVox %build_icons mmake=demo-newvox-icons icons=NewVox dir=$(DESTDIR) diff --git a/Demo/NewVox/mmakefile.src b/Demo/NewVox/mmakefile.src index 7b7535e89..bc4383a1e 100644 --- a/Demo/NewVox/mmakefile.src +++ b/Demo/NewVox/mmakefile.src @@ -2,7 +2,7 @@ include $(TOP)/config/make.cfg #MM demo-newvox : demo-newvox-icons -DESTDIR := $(CONTRIBDIR)/Demos/NewVox +DESTDIR := $(AROS_CONTRIB)/Demos/NewVox %build_prog mmake=demo-newvox \ progname=NewVox targetdir=$(DESTDIR) \ diff --git a/Demo/Parallax/icons/mmakefile.src b/Demo/Parallax/icons/mmakefile.src index 3d22f2c64..7d6b409d4 100644 --- a/Demo/Parallax/icons/mmakefile.src +++ b/Demo/Parallax/icons/mmakefile.src @@ -1,6 +1,6 @@ include $(TOP)/config/make.cfg -DESTDIR := $(CONTRIBDIR)/Demos/Parallax +DESTDIR := $(AROS_CONTRIB)/Demos/Parallax %build_icons mmake=demo-parallax-icons icons=Parallax dir=$(DESTDIR) diff --git a/Demo/Parallax/mmakefile.src b/Demo/Parallax/mmakefile.src index e6ee7050f..c19a0509b 100644 --- a/Demo/Parallax/mmakefile.src +++ b/Demo/Parallax/mmakefile.src @@ -2,7 +2,7 @@ include $(TOP)/config/make.cfg #MM demo-parallax : demo-parallax-icons -DESTDIR := $(CONTRIBDIR)/Demos/Parallax +DESTDIR := $(AROS_CONTRIB)/Demos/Parallax %build_prog mmake=demo-parallax \ progname=Parallax targetdir=$(DESTDIR) \ diff --git a/Demo/PowerZoom/mmakefile.src b/Demo/PowerZoom/mmakefile.src index 89e6d380c..775a28c90 100644 --- a/Demo/PowerZoom/mmakefile.src +++ b/Demo/PowerZoom/mmakefile.src @@ -1,6 +1,6 @@ include $(TOP)/config/make.cfg -DESTDIR := $(CONTRIBDIR)/Demos/PowerZoom +DESTDIR := $(AROS_CONTRIB)/Demos/PowerZoom %build_prog mmake=demo-powerzoom \ progname=PowerZoom targetdir=$(DESTDIR) \ diff --git a/Demo/RubberStrings/icons/mmakefile.src b/Demo/RubberStrings/icons/mmakefile.src index 871e081b4..28fb3219d 100644 --- a/Demo/RubberStrings/icons/mmakefile.src +++ b/Demo/RubberStrings/icons/mmakefile.src @@ -1,6 +1,6 @@ include $(TOP)/config/make.cfg -DESTDIR := $(CONTRIBDIR)/Demos/RubberStrings +DESTDIR := $(AROS_CONTRIB)/Demos/RubberStrings %build_icons mmake=demo-rubberstrings-icons icons=Rubberstrings dir=$(DESTDIR) diff --git a/Demo/RubberStrings/mmakefile.src b/Demo/RubberStrings/mmakefile.src index cd65d2e1e..e8b2dd0cf 100644 --- a/Demo/RubberStrings/mmakefile.src +++ b/Demo/RubberStrings/mmakefile.src @@ -2,7 +2,7 @@ include $(TOP)/config/make.cfg #MM demo-rubberstrings : demo-rubberstrings-icons -DESTDIR := $(CONTRIBDIR)/Demos/RubberStrings +DESTDIR := $(AROS_CONTRIB)/Demos/RubberStrings %build_prog mmake=demo-rubberstrings \ progname=Rubberstrings targetdir=$(DESTDIR) \ diff --git a/Demo/Tunnel/icons/mmakefile.src b/Demo/Tunnel/icons/mmakefile.src index f74fa0e6d..00a6f7d31 100644 --- a/Demo/Tunnel/icons/mmakefile.src +++ b/Demo/Tunnel/icons/mmakefile.src @@ -1,6 +1,6 @@ include $(TOP)/config/make.cfg -DESTDIR := $(CONTRIBDIR)/Demos/Tunnel +DESTDIR := $(AROS_CONTRIB)/Demos/Tunnel %define build_icons mmake=demo-tunnel-icons icons=Tunnel dir=$(DESTDIR) diff --git a/Demo/Tunnel/mmakefile.src b/Demo/Tunnel/mmakefile.src index 9aa5d0ec3..c46393ae4 100644 --- a/Demo/Tunnel/mmakefile.src +++ b/Demo/Tunnel/mmakefile.src @@ -2,7 +2,7 @@ include $(TOP)/config/make.cfg #MM demo-tunnel : demo-tunnel-icons demo-tunnel-data -DESTDIR := $(CONTRIBDIR)/Demos/Tunnel +DESTDIR := $(AROS_CONTRIB)/Demos/Tunnel %build_prog mmake=demo-tunnel \ progname=Tunnel targetdir=$(DESTDIR) \ diff --git a/Demo/Voxel/icons/mmakefile.src b/Demo/Voxel/icons/mmakefile.src index 7ec7d13bc..17ac64c04 100644 --- a/Demo/Voxel/icons/mmakefile.src +++ b/Demo/Voxel/icons/mmakefile.src @@ -1,6 +1,6 @@ include $(TOP)/config/make.cfg -DESTDIR := $(CONTRIBDIR)/Demos/Voxel +DESTDIR := $(AROS_CONTRIB)/Demos/Voxel %build_icons mmake=demo-voxel-icons icons=Voxel dir=$(DESTDIR) diff --git a/Demo/Voxel/mmakefile.src b/Demo/Voxel/mmakefile.src index d06e8bcfd..74e1d1de6 100644 --- a/Demo/Voxel/mmakefile.src +++ b/Demo/Voxel/mmakefile.src @@ -2,7 +2,7 @@ include $(TOP)/config/make.cfg #MM demo-voxel : demo-voxel-icons demo-voxel-images -DESTDIR := $(CONTRIBDIR)/Demos/Voxel +DESTDIR := $(AROS_CONTRIB)/Demos/Voxel %build_prog mmake=demo-voxel \ progname=Voxel targetdir=$(DESTDIR) \ diff --git a/Demo/kdp/mmakefile.src b/Demo/kdp/mmakefile.src index 0eecf6634..8e3df88a4 100644 --- a/Demo/kdp/mmakefile.src +++ b/Demo/kdp/mmakefile.src @@ -1,6 +1,6 @@ include $(TOP)/config/make.cfg -DESTDIR := $(CONTRIBDIR)/Demos/kdp +DESTDIR := $(AROS_CONTRIB)/Demos/kdp OBJECTDIR := $(DESTDIR)/objects RAWDIR := $(DESTDIR)/raw BMPDIR := $(DESTDIR)/bmp diff --git a/Demo/mmakefile.src b/Demo/mmakefile.src index 546456c3b..5101351b4 100644 --- a/Demo/mmakefile.src +++ b/Demo/mmakefile.src @@ -24,7 +24,7 @@ include $(TOP)/config/make.cfg #MM demo-mesa SCRIPTFILES = StartSomeDemos StartSomeDemos2 StartMesaDemos -DSTDIR := $(CONTRIBDIR)/Demos +DSTDIR := $(AROS_CONTRIB)/Demos %copy_files_q mmake=demo-startscripts files=$(SCRIPTFILES) dst=$(DSTDIR) diff --git a/DiskSpeed/icons/mmakefile.src b/DiskSpeed/icons/mmakefile.src index 1ddbce994..b2bbcb06b 100644 --- a/DiskSpeed/icons/mmakefile.src +++ b/DiskSpeed/icons/mmakefile.src @@ -1,6 +1,6 @@ include $(TOP)/config/make.cfg -DESTDIR := $(CONTRIBDIR)/DiskSpeed +DESTDIR := $(AROS_CONTRIB)/DiskSpeed ICONS := DiskSpeed ScsiSpeed DiskSpeed.doc %build_icons mmake=contrib-diskspeed-icons icons=$(ICONS) dir=$(DESTDIR) diff --git a/DiskSpeed/mmakefile.src b/DiskSpeed/mmakefile.src index 58052f703..00a285f72 100644 --- a/DiskSpeed/mmakefile.src +++ b/DiskSpeed/mmakefile.src @@ -1,6 +1,6 @@ include $(TOP)/config/make.cfg -DESTDIR := $(CONTRIBDIR)/DiskSpeed +DESTDIR := $(AROS_CONTRIB)/DiskSpeed USER_CFLAGS := -I$(SRCDIR)/$(CURDIR) -I$(SRCDIR)/$(CURDIR)/diskspeed -I$(SRCDIR)/$(CURDIR)/scsispeed diff --git a/FryingPan/DTLib/mmakefile.src b/FryingPan/DTLib/mmakefile.src index cd3a3636e..a3b49fc32 100644 --- a/FryingPan/DTLib/mmakefile.src +++ b/FryingPan/DTLib/mmakefile.src @@ -10,7 +10,7 @@ include $(TOP)/config/make.cfg #MM contrib-fryingpan-framework-libc \ #MM contrib-libs-mpega-includes -DESTDIR := $(CONTRIBDIR)/FryingPan/Libs +DESTDIR := $(AROS_CONTRIB)/FryingPan/Libs CXXFILES := \ Main \ diff --git a/FryingPan/Data/mmakefile.src b/FryingPan/Data/mmakefile.src index 59bf287f9..a82bbce6c 100644 --- a/FryingPan/Data/mmakefile.src +++ b/FryingPan/Data/mmakefile.src @@ -2,6 +2,6 @@ include $(TOP)/config/make.cfg -DESTDIR := $(CONTRIBDIR)/FryingPan +DESTDIR := $(AROS_CONTRIB)/FryingPan %copy_dir_recursive mmake=contrib-fryingpan-data dst=$(DESTDIR) diff --git a/FryingPan/Expat/mmakefile.src b/FryingPan/Expat/mmakefile.src index 029108efe..82f5d91b5 100644 --- a/FryingPan/Expat/mmakefile.src +++ b/FryingPan/Expat/mmakefile.src @@ -9,7 +9,7 @@ include $(TOP)/config/make.cfg #MM contrib-fryingpan-framework-genericlib \ #MM contrib-fryingpan-framework-libc -DESTDIR := $(CONTRIBDIR)/FryingPan/Libs +DESTDIR := $(AROS_CONTRIB)/FryingPan/Libs FILES := \ xmlrole \ diff --git a/FryingPan/FP/Engine/mmakefile.src b/FryingPan/FP/Engine/mmakefile.src index efd1101bf..6b8d53321 100644 --- a/FryingPan/FP/Engine/mmakefile.src +++ b/FryingPan/FP/Engine/mmakefile.src @@ -9,7 +9,7 @@ include $(TOP)/config/make.cfg #MM contrib-fryingpan-framework-genericlib \ #MM contrib-fryingpan-framework-libc -DESTDIR := $(CONTRIBDIR)/FryingPan/Libs +DESTDIR := $(AROS_CONTRIB)/FryingPan/Libs CXXFILES := \ Wrapper \ diff --git a/FryingPan/FP/GUI-MUI/mmakefile.src b/FryingPan/FP/GUI-MUI/mmakefile.src index 972e85481..02b1113fb 100644 --- a/FryingPan/FP/GUI-MUI/mmakefile.src +++ b/FryingPan/FP/GUI-MUI/mmakefile.src @@ -10,7 +10,7 @@ include $(TOP)/config/make.cfg #MM contrib-fryingpan-framework-libc \ #MM contrib-fryingpan-framework-genericlib -DESTDIR := $(CONTRIBDIR)/FryingPan/Libs +DESTDIR := $(AROS_CONTRIB)/FryingPan/Libs CXXFILES := \ Wrapper \ diff --git a/FryingPan/FP/mmakefile.src b/FryingPan/FP/mmakefile.src index 7c75276b9..3cbbc62b4 100644 --- a/FryingPan/FP/mmakefile.src +++ b/FryingPan/FP/mmakefile.src @@ -11,7 +11,7 @@ include $(TOP)/config/make.cfg #MM contrib-fryingpan-framework-generic \ #MM contrib-fryingpan-framework-libc -DESTDIR := $(CONTRIBDIR)/FryingPan +DESTDIR := $(AROS_CONTRIB)/FryingPan FILES := ../framework/Startup/Startup_aros Main Application Globals diff --git a/FryingPan/ISOBuilder/mmakefile.src b/FryingPan/ISOBuilder/mmakefile.src index 01063b4e6..01b1cfad9 100644 --- a/FryingPan/ISOBuilder/mmakefile.src +++ b/FryingPan/ISOBuilder/mmakefile.src @@ -9,7 +9,7 @@ include $(TOP)/config/make.cfg #MM contrib-fryingpan-framework-genericlib \ #MM contrib-fryingpan-framework-libc -DESTDIR := $(CONTRIBDIR)/FryingPan/Libs +DESTDIR := $(AROS_CONTRIB)/FryingPan/Libs CXXFILES := \ Calls \ diff --git a/FryingPan/Optical/mmakefile.src b/FryingPan/Optical/mmakefile.src index 5e84ead33..35ea03ad2 100644 --- a/FryingPan/Optical/mmakefile.src +++ b/FryingPan/Optical/mmakefile.src @@ -9,7 +9,7 @@ include $(TOP)/config/make.cfg #MM contrib-fryingpan-framework-genericlib \ #MM contrib-fryingpan-framework-libc -DESTDIR := $(CONTRIBDIR)/FryingPan/Libs +DESTDIR := $(AROS_CONTRIB)/FryingPan/Libs CXXFILES := \ LibWrapper \ diff --git a/Games/Bomber/mmakefile.src b/Games/Bomber/mmakefile.src index edcf5470d..1c580bf92 100644 --- a/Games/Bomber/mmakefile.src +++ b/Games/Bomber/mmakefile.src @@ -3,7 +3,7 @@ include $(TOP)/config/make.cfg FILES := Main -EXEDIR := $(CONTRIBDIR)/Games/Bomber +EXEDIR := $(AROS_CONTRIB)/Games/Bomber #MM- contrib-games : Bomber #MM Bomber : Bomber-datafiles diff --git a/Games/Doom/icons/mmakefile.src b/Games/Doom/icons/mmakefile.src index 243808b0b..d755fc5e5 100644 --- a/Games/Doom/icons/mmakefile.src +++ b/Games/Doom/icons/mmakefile.src @@ -3,7 +3,7 @@ include $(TOP)/config/make.cfg #MM- Doom-extra : Doom-extra-icons -EXEDIR := $(CONTRIBDIR)/Games/Doom +EXEDIR := $(AROS_CONTRIB)/Games/Doom %build_icons mmake=Doom-extra-icons icons=Doom dir=$(EXEDIR) diff --git a/Games/Doom/mmakefile.src b/Games/Doom/mmakefile.src index 2cbe58207..7f0a237ee 100644 --- a/Games/Doom/mmakefile.src +++ b/Games/Doom/mmakefile.src @@ -1,7 +1,7 @@ # $Id$ include $(TOP)/config/make.cfg -EXEDIR := $(CONTRIBDIR)/Games/Doom +EXEDIR := $(AROS_CONTRIB)/Games/Doom USER_CFLAGS = -DAROS -DNORMALUNIX -DUNROLL -O3 -ffast-math -funroll-loops \ -fomit-frame-pointer -fexpensive-optimizations diff --git a/Games/Kiel/Jump/mmakefile.src b/Games/Kiel/Jump/mmakefile.src index 4b22e0700..7d3f69bd9 100644 --- a/Games/Kiel/Jump/mmakefile.src +++ b/Games/Kiel/Jump/mmakefile.src @@ -1,7 +1,7 @@ include $(TOP)/config/make.cfg FILES := Jump JumpEd -DESTDIR := $(CONTRIBDIR)/Games/Kiel +DESTDIR := $(AROS_CONTRIB)/Games/Kiel #MM games-kiel-jump : games-kiel-jump-info diff --git a/Games/Kiel/Mine/catalogs/mmakefile.src b/Games/Kiel/Mine/catalogs/mmakefile.src index 0449c74f6..518b43999 100644 --- a/Games/Kiel/Mine/catalogs/mmakefile.src +++ b/Games/Kiel/Mine/catalogs/mmakefile.src @@ -5,4 +5,4 @@ include $(TOP)/config/make.cfg %build_catalogs mmake=games-kiel-mine-catalogs \ name=Mine subdir= \ - dir=$(CONTRIBDIR)/Games/Kiel/Catalogs + dir=$(AROS_CONTRIB)/Games/Kiel/Catalogs diff --git a/Games/Kiel/Mine/mmakefile.src b/Games/Kiel/Mine/mmakefile.src index c7c17ca2b..264e48d78 100644 --- a/Games/Kiel/Mine/mmakefile.src +++ b/Games/Kiel/Mine/mmakefile.src @@ -1,7 +1,7 @@ include $(TOP)/config/make.cfg FILES := Mine -DESTDIR := $(CONTRIBDIR)/Games/Kiel +DESTDIR := $(AROS_CONTRIB)/Games/Kiel #MM- contrib-games : games-kiel-mine diff --git a/Games/Kiel/Quad/mmakefile.src b/Games/Kiel/Quad/mmakefile.src index 59b8aa6f0..8ee3de618 100644 --- a/Games/Kiel/Quad/mmakefile.src +++ b/Games/Kiel/Quad/mmakefile.src @@ -1,7 +1,7 @@ include $(TOP)/config/make.cfg FILES := Quad -DESTDIR :=$(CONTRIBDIR)/Games/Kiel +DESTDIR :=$(AROS_CONTRIB)/Games/Kiel #MM- contrib-games : games-kiel-quad diff --git a/Games/Kiel/Rotate/mmakefile.src b/Games/Kiel/Rotate/mmakefile.src index 0d77f2950..061650f28 100644 --- a/Games/Kiel/Rotate/mmakefile.src +++ b/Games/Kiel/Rotate/mmakefile.src @@ -1,7 +1,7 @@ include $(TOP)/config/make.cfg FILES := Rotate -DESTDIR := $(CONTRIBDIR)/Games/Kiel +DESTDIR := $(AROS_CONTRIB)/Games/Kiel #MM- contrib-games : games-kiel-rotate diff --git a/Games/Kiel/Wumpus/catalogs/mmakefile.src b/Games/Kiel/Wumpus/catalogs/mmakefile.src index 66cbe15e4..4553fcec6 100644 --- a/Games/Kiel/Wumpus/catalogs/mmakefile.src +++ b/Games/Kiel/Wumpus/catalogs/mmakefile.src @@ -5,4 +5,4 @@ include $(TOP)/config/make.cfg %build_catalogs mmake=games-kiel-wumpus-catalogs \ name=Wumpus subdir= \ - dir=$(CONTRIBDIR)/Games/Kiel/Catalogs + dir=$(AROS_CONTRIB)/Games/Kiel/Catalogs diff --git a/Games/Kiel/Wumpus/mmakefile.src b/Games/Kiel/Wumpus/mmakefile.src index 82883a368..ab9bfee8a 100644 --- a/Games/Kiel/Wumpus/mmakefile.src +++ b/Games/Kiel/Wumpus/mmakefile.src @@ -5,7 +5,7 @@ FILES := Wumpus #MM- contrib-games : games-kiel-wumpus %build_prog mmake=games-kiel-wumpus \ - progname=Wumpus targetdir=$(CONTRIBDIR)/Games/Kiel \ + progname=Wumpus targetdir=$(AROS_CONTRIB)/Games/Kiel \ files=$(FILES) #MM games-kiel-wumpus : games-kiel-wumpus-catalogs diff --git a/Games/Moria3D/Source/mmakefile.src b/Games/Moria3D/Source/mmakefile.src index e81dd2650..b59d354b8 100644 --- a/Games/Moria3D/Source/mmakefile.src +++ b/Games/Moria3D/Source/mmakefile.src @@ -1,9 +1,9 @@ # $Id$ include $(TOP)/config/make.cfg -LIBS := -L$(LIBDIR) -lamiga -larossupport -lautoinit -lstdc +LIBS := -L$(AROS_LIB) -lamiga -larossupport -lautoinit -lstdc -INSTDIR := $(CONTRIBDIR)/Games/Moria3D +INSTDIR := $(AROS_CONTRIB)/Games/Moria3D EXE := $(INSTDIR)/Moria3D OBJS := $(GENDIR)/$(CURDIR)/Moveing.o \ diff --git a/Games/Moria3D/mmakefile.src b/Games/Moria3D/mmakefile.src index 884ff9398..2810c109f 100644 --- a/Games/Moria3D/mmakefile.src +++ b/Games/Moria3D/mmakefile.src @@ -4,7 +4,7 @@ include $(TOP)/config/make.cfg FILES := $(call WILDCARD, Levels/Level* Levels/Mission* Levels/Story*) \ $(call WILDCARD, Textures/*.256) \ Missions -INSTDIR := $(CONTRIBDIR)/Games/Moria3D +INSTDIR := $(AROS_CONTRIB)/Games/Moria3D DEST := $(foreach f,$(FILES),$(INSTDIR)/$(f)) diff --git a/Games/Quake/mmakefile.src b/Games/Quake/mmakefile.src index d1fe0ed2c..2bf5cb964 100644 --- a/Games/Quake/mmakefile.src +++ b/Games/Quake/mmakefile.src @@ -1,12 +1,12 @@ # $Id$ include $(TOP)/config/make.cfg -INSTDIR := $(CONTRIBDIR)/Games/Quake +INSTDIR := $(AROS_CONTRIB)/Games/Quake BUILDDIR := $(GENDIR)/$(CURDIR) -STARTUP := $(LIBDIR)/startup.o -LIBS := -L$(LIBDIR) -lamiga -larossupport -lautoinit -DEPLIBS := $(STARTUP) $(LIBDIR)/libstdc.a \ - $(LIBDIR)/libamiga.a $(LIBDIR)/libarossupport.a +STARTUP := $(AROS_LIB)/startup.o +LIBS := -L$(AROS_LIB) -lamiga -larossupport -lautoinit +DEPLIBS := $(STARTUP) $(AROS_LIB)/libstdc.a \ + $(AROS_LIB)/libamiga.a $(AROS_LIB)/libarossupport.a EXE := $(INSTDIR)/quake @@ -53,7 +53,7 @@ BASE_CFLAGS=-Dstricmp=strcasecmp DEBUG_CFLAGS=$(CFLAGS) $(BASE_CFLAGS) -g AROSCFLAGS=-DAROS $(RELEASE_CFLAGS) -AROSLDFLAGS=-L$(LIBDIR) -lamiga -lautoinit -nix +AROSLDFLAGS=-L$(AROS_LIB) -lamiga -lautoinit -nix DO_CC=$(CC) $(CFLAGS) -o $@ -c $< DO_DEBUG_CC=$(CC) $(DEBUG_CFLAGS) -o $@ -c $< diff --git a/Games/XInvaders3D/mmakefile.src b/Games/XInvaders3D/mmakefile.src index 330160a6e..5f5bf016d 100644 --- a/Games/XInvaders3D/mmakefile.src +++ b/Games/XInvaders3D/mmakefile.src @@ -3,7 +3,7 @@ include $(TOP)/config/make.cfg FILES := game aliens player effects object camera vec4x1 mat4x4 main-aros -EXEDIR := $(CONTRIBDIR)/Games/XInvaders3D +EXEDIR := $(AROS_CONTRIB)/Games/XInvaders3D USER_CFLAGS = -DGAME_AROS diff --git a/Games/cxhextris/mmakefile.src b/Games/cxhextris/mmakefile.src index b3ce78757..ef1b413d0 100644 --- a/Games/cxhextris/mmakefile.src +++ b/Games/cxhextris/mmakefile.src @@ -3,7 +3,7 @@ include $(TOP)/config/make.cfg FILES := hextris stdsys arosio shape -EXEDIR := $(CONTRIBDIR)/Games/CXHextris +EXEDIR := $(AROS_CONTRIB)/Games/CXHextris USER_CFLAGS = -DHIGHSCOREFILE=\""S:chextris-scores"\" diff --git a/Games/lbreakout2/mmakefile.src b/Games/lbreakout2/mmakefile.src index a45731b3a..05a4a971a 100644 --- a/Games/lbreakout2/mmakefile.src +++ b/Games/lbreakout2/mmakefile.src @@ -11,4 +11,4 @@ include $(TOP)/config/make.cfg %build_with_configure mmake=contrib-games-lbreakout2 nix=yes \ extraoptions="--with-highscore-path='$$(PROGDIR)data' --with-inst-path='$$(PROGDIR)data' \ --disable-audio --disable-sdltest --disable-network --with-doc-path='$$(PROGDIR)docs'" \ - prefix=$(CONTRIBDIR)/Games/LBreakout2 nix_dir_layout=no + prefix=$(AROS_CONTRIB)/Games/LBreakout2 nix_dir_layout=no diff --git a/Games/spout/mmakefile.src b/Games/spout/mmakefile.src index a7bd8de10..9dc06cb63 100644 --- a/Games/spout/mmakefile.src +++ b/Games/spout/mmakefile.src @@ -9,5 +9,5 @@ include $(TOP)/config/make.cfg %build_with_configure mmake=contrib-games-spout nix=yes \ extraoptions="--disable-sdl-test" \ - prefix=$(CONTRIBDIR)/Games/Spout nix_dir_layout=no + prefix=$(AROS_CONTRIB)/Games/Spout nix_dir_layout=no diff --git a/Games/wumpus/mmakefile.src b/Games/wumpus/mmakefile.src index 3ac6539ba..c42b604df 100644 --- a/Games/wumpus/mmakefile.src +++ b/Games/wumpus/mmakefile.src @@ -3,5 +3,5 @@ include $(TOP)/config/make.cfg #MM games-wumpus : includes linklibs %build_prog mmake=games-wumpus \ - progname=wumpus targetdir=$(CONTRIBDIR)/Games \ + progname=wumpus targetdir=$(AROS_CONTRIB)/Games \ files=wumpus diff --git a/Misc/Bench/Dhrystone/mmakefile.src b/Misc/Bench/Dhrystone/mmakefile.src index e53dd4d63..86d6f4e26 100644 --- a/Misc/Bench/Dhrystone/mmakefile.src +++ b/Misc/Bench/Dhrystone/mmakefile.src @@ -6,7 +6,7 @@ include $(TOP)/config/make.cfg FILES := dhry21a dhry21b timers -EXEDIR := $(CONTRIBDIR)/Misc/Bench/Dhrystone +EXEDIR := $(AROS_CONTRIB)/Misc/Bench/Dhrystone USER_CFLAGS := -O2 -Wunused -Wall diff --git a/Misc/DDemo7/mmakefile.src b/Misc/DDemo7/mmakefile.src index 5aa3b719e..bc18eb9db 100644 --- a/Misc/DDemo7/mmakefile.src +++ b/Misc/DDemo7/mmakefile.src @@ -1,7 +1,7 @@ include $(TOP)/config/make.cfg %build_prog mmake=contrib-ddemo7 \ - progname=DDemo7 targetdir=$(CONTRIBDIR)/Misc \ + progname=DDemo7 targetdir=$(AROS_CONTRIB)/Misc \ files=DDemo7 diff --git a/Misc/Linie12/mmakefile.src b/Misc/Linie12/mmakefile.src index 05b094d4a..fec8fec02 100644 --- a/Misc/Linie12/mmakefile.src +++ b/Misc/Linie12/mmakefile.src @@ -1,5 +1,5 @@ include $(TOP)/config/make.cfg %build_prog mmake=contrib-linie12 \ - progname=Linie12 targetdir=$(CONTRIBDIR)/Misc \ + progname=Linie12 targetdir=$(AROS_CONTRIB)/Misc \ files=Linie12 diff --git a/Misc/SWitch/mmakefile.src b/Misc/SWitch/mmakefile.src index ee8a2ebd6..4dd34e885 100644 --- a/Misc/SWitch/mmakefile.src +++ b/Misc/SWitch/mmakefile.src @@ -1,5 +1,5 @@ include $(TOP)/config/make.cfg %build_prog mmake=contrib-switch \ - progname=SWitch targetdir=$(CONTRIBDIR)/Misc \ + progname=SWitch targetdir=$(AROS_CONTRIB)/Misc \ files=SWitch diff --git a/Misc/SortCopy/mmakefile.src b/Misc/SortCopy/mmakefile.src index b488b2525..205589cd3 100644 --- a/Misc/SortCopy/mmakefile.src +++ b/Misc/SortCopy/mmakefile.src @@ -1,7 +1,7 @@ include $(TOP)/config/make.cfg %build_prog mmake=contrib-sortcopy \ - progname=SortCopy targetdir=$(CONTRIBDIR)/Misc \ + progname=SortCopy targetdir=$(AROS_CONTRIB)/Misc \ files=SortCopy diff --git a/Misc/berger/mmakefile.src b/Misc/berger/mmakefile.src index 354e877f9..bb583bf2e 100644 --- a/Misc/berger/mmakefile.src +++ b/Misc/berger/mmakefile.src @@ -1,7 +1,7 @@ include $(TOP)/config/make.cfg %build_prog mmake=contrib-misc-m68kemul \ - progname=m68kemul targetdir=$(CONTRIBDIR)/Misc/Berger \ + progname=m68kemul targetdir=$(AROS_CONTRIB)/Misc/Berger \ files="m68kemul kernellibs addressingmodes conditioncodes" \ usestartup=no diff --git a/Misc/berger/samples/mmakefile b/Misc/berger/samples/mmakefile index 705a29b20..2b7c55ba2 100644 --- a/Misc/berger/samples/mmakefile +++ b/Misc/berger/samples/mmakefile @@ -1,6 +1,6 @@ include $(TOP)/config/make.cfg -DESTDIR := $(CONTRIBDIR)/Misc/Berger +DESTDIR := $(AROS_CONTRIB)/Misc/Berger SAMPLES = registertest branchtest loops addressing benchmark diff --git a/MultiMedia/AMP2/mmakefile.src b/MultiMedia/AMP2/mmakefile.src index ab717f570..4514d4cc6 100644 --- a/MultiMedia/AMP2/mmakefile.src +++ b/MultiMedia/AMP2/mmakefile.src @@ -47,7 +47,7 @@ parser/qt/elst parser/qt/dref parser/qt/stsdtable parser/qt/util parser/qt/qt OBJS = $(MAIN) $(AROSFILES) $(AMIGAOS) $(COMMON) $(AUDIO) $(REFRESH) $(DVD) $(PARSER) -EXEDIR := $(CONTRIBDIR)/MultiMedia/AMP2 +EXEDIR := $(AROS_CONTRIB)/MultiMedia/AMP2 USER_CFLAGS := -I$(SRCDIR)/$(CURDIR)/aros -I$(SRCDIR)/$(CURDIR)/amigaos -I$(SRCDIR)/$(CURDIR)/audio -I$(SRCDIR)/$(CURDIR)/common -I$(SRCDIR)/$(CURDIR)/main -I$(SRCDIR)/$(CURDIR)/parser -I$(SRCDIR)/$(CURDIR)/parser/dvd -I$(SRCDIR)/$(CURDIR)/parser/dvd/dvdnav -I$(SRCDIR)/$(CURDIR)/parser/dvd/dvdread -I$(SRCDIR)/$(CURDIR)/parser/mpeg -I$(SRCDIR)/$(CURDIR)/parser/vcd -I$(SRCDIR)/$(CURDIR)/parser/qt -I$(SRCDIR)/$(CURDIR)/plugin -Irefresh diff --git a/MultiMedia/AMP2/plugin/a52/mmakefile.src b/MultiMedia/AMP2/plugin/a52/mmakefile.src index d6831fd4c..78f00ad76 100644 --- a/MultiMedia/AMP2/plugin/a52/mmakefile.src +++ b/MultiMedia/AMP2/plugin/a52/mmakefile.src @@ -14,7 +14,7 @@ MAIN = bitstream imdct bit_allocate parse downmix a52dec OBJS = $(MAIN) $(COMMON) -EXEDIR := $(CONTRIBDIR)/MultiMedia/AMP2/Plugin +EXEDIR := $(AROS_CONTRIB)/MultiMedia/AMP2/Plugin USER_CFLAGS := -I$(SRCDIR)/$(CURDIR)/../../common -I$(SRCDIR)/$(CURDIR)/../../aros diff --git a/MultiMedia/AMP2/plugin/cvid/mmakefile.src b/MultiMedia/AMP2/plugin/cvid/mmakefile.src index d2923d15a..eebdb8db0 100644 --- a/MultiMedia/AMP2/plugin/cvid/mmakefile.src +++ b/MultiMedia/AMP2/plugin/cvid/mmakefile.src @@ -14,7 +14,7 @@ MAIN = main OBJS = $(MAIN) $(COMMON) -EXEDIR := $(CONTRIBDIR)/MultiMedia/AMP2/Plugin +EXEDIR := $(AROS_CONTRIB)/MultiMedia/AMP2/Plugin USER_CFLAGS := -I$(SRCDIR)/$(CURDIR)/../../common -I$(SRCDIR)/$(CURDIR)/../../aros diff --git a/MultiMedia/AMP2/plugin/h263/mmakefile.src b/MultiMedia/AMP2/plugin/h263/mmakefile.src index 7554b0422..a1f1b8499 100644 --- a/MultiMedia/AMP2/plugin/h263/mmakefile.src +++ b/MultiMedia/AMP2/plugin/h263/mmakefile.src @@ -15,7 +15,7 @@ mjpeg dsputil msmpeg4 h263dec rv10 main OBJS = $(MAIN) $(COMMON) -EXEDIR := $(CONTRIBDIR)/MultiMedia/AMP2/Plugin +EXEDIR := $(AROS_CONTRIB)/MultiMedia/AMP2/Plugin USER_CFLAGS := -I$(SRCDIR)/$(CURDIR)/../../common -I$(SRCDIR)/$(CURDIR)/../../aros diff --git a/MultiMedia/AMP2/plugin/ima4/mmakefile.src b/MultiMedia/AMP2/plugin/ima4/mmakefile.src index 523522ddb..22b4deffa 100644 --- a/MultiMedia/AMP2/plugin/ima4/mmakefile.src +++ b/MultiMedia/AMP2/plugin/ima4/mmakefile.src @@ -14,7 +14,7 @@ MAIN = main OBJS = $(MAIN) $(COMMON) -EXEDIR := $(CONTRIBDIR)/MultiMedia/AMP2/Plugin +EXEDIR := $(AROS_CONTRIB)/MultiMedia/AMP2/Plugin USER_CFLAGS := -I$(SRCDIR)/$(CURDIR)/../../common -I$(SRCDIR)/$(CURDIR)/../../aros diff --git a/MultiMedia/AMP2/plugin/mace/mmakefile.src b/MultiMedia/AMP2/plugin/mace/mmakefile.src index b9dbc075e..00807b724 100644 --- a/MultiMedia/AMP2/plugin/mace/mmakefile.src +++ b/MultiMedia/AMP2/plugin/mace/mmakefile.src @@ -14,7 +14,7 @@ MAIN = main OBJS = $(MAIN) $(COMMON) -EXEDIR := $(CONTRIBDIR)/MultiMedia/AMP2/Plugin +EXEDIR := $(AROS_CONTRIB)/MultiMedia/AMP2/Plugin USER_CFLAGS := -I$(SRCDIR)/$(CURDIR)/../../common -I$(SRCDIR)/$(CURDIR)/../../aros diff --git a/MultiMedia/AMP2/plugin/mpega/mmakefile.src b/MultiMedia/AMP2/plugin/mpega/mmakefile.src index a68fdf2b3..62e6da0f7 100644 --- a/MultiMedia/AMP2/plugin/mpega/mmakefile.src +++ b/MultiMedia/AMP2/plugin/mpega/mmakefile.src @@ -14,7 +14,7 @@ MAIN = layer1 layer2 layer3 decode decode_2to1 decode_4to1 dct64 tabinit mpg123 OBJS = $(MAIN) $(COMMON) -EXEDIR := $(CONTRIBDIR)/MultiMedia/AMP2/Plugin +EXEDIR := $(AROS_CONTRIB)/MultiMedia/AMP2/Plugin USER_CFLAGS := -I$(SRCDIR)/$(CURDIR)/../../common -I$(SRCDIR)/$(CURDIR)/../../aros diff --git a/MultiMedia/AMP2/plugin/mpegv/mmakefile.src b/MultiMedia/AMP2/plugin/mpegv/mmakefile.src index 65abd6b07..de388a6b4 100644 --- a/MultiMedia/AMP2/plugin/mpegv/mmakefile.src +++ b/MultiMedia/AMP2/plugin/mpegv/mmakefile.src @@ -14,7 +14,7 @@ MAIN = slice idct motion_comp decode header mpeg2dec OBJS = $(MAIN) $(COMMON) -EXEDIR := $(CONTRIBDIR)/MultiMedia/AMP2/Plugin +EXEDIR := $(AROS_CONTRIB)/MultiMedia/AMP2/Plugin USER_CFLAGS := -I$(SRCDIR)/$(CURDIR)/../../common -I$(SRCDIR)/$(CURDIR)/../../aros diff --git a/MultiMedia/AMP2/plugin/mpegvlo/mmakefile.src b/MultiMedia/AMP2/plugin/mpegvlo/mmakefile.src index f63d07abc..6e5762ac3 100644 --- a/MultiMedia/AMP2/plugin/mpegvlo/mmakefile.src +++ b/MultiMedia/AMP2/plugin/mpegvlo/mmakefile.src @@ -14,7 +14,7 @@ MAIN = slice idct motion_comp decode header mpeg2dec OBJS = $(MAIN) $(COMMON) -EXEDIR := $(CONTRIBDIR)/MultiMedia/AMP2/Plugin +EXEDIR := $(AROS_CONTRIB)/MultiMedia/AMP2/Plugin USER_CFLAGS := -I$(SRCDIR)/$(CURDIR)/../../common -I$(SRCDIR)/$(CURDIR)/../../aros diff --git a/MultiMedia/AMP2/plugin/msvc/mmakefile.src b/MultiMedia/AMP2/plugin/msvc/mmakefile.src index f2a536178..92da0d1ea 100644 --- a/MultiMedia/AMP2/plugin/msvc/mmakefile.src +++ b/MultiMedia/AMP2/plugin/msvc/mmakefile.src @@ -14,7 +14,7 @@ MAIN = main OBJS = $(MAIN) $(COMMON) -EXEDIR := $(CONTRIBDIR)/MultiMedia/AMP2/Plugin +EXEDIR := $(AROS_CONTRIB)/MultiMedia/AMP2/Plugin USER_CFLAGS := -I$(SRCDIR)/$(CURDIR)/../../common -I$(SRCDIR)/$(CURDIR)/../../aros diff --git a/MultiMedia/AMP2/plugin/pcm/mmakefile.src b/MultiMedia/AMP2/plugin/pcm/mmakefile.src index 287b36d4c..d9b6f4fe7 100644 --- a/MultiMedia/AMP2/plugin/pcm/mmakefile.src +++ b/MultiMedia/AMP2/plugin/pcm/mmakefile.src @@ -14,7 +14,7 @@ MAIN = main OBJS = $(MAIN) $(COMMON) -EXEDIR := $(CONTRIBDIR)/MultiMedia/AMP2/Plugin +EXEDIR := $(AROS_CONTRIB)/MultiMedia/AMP2/Plugin USER_CFLAGS := -I$(SRCDIR)/$(CURDIR)/../../common -I$(SRCDIR)/$(CURDIR)/../../aros diff --git a/MultiMedia/AMP2/plugin/real/mmakefile.src b/MultiMedia/AMP2/plugin/real/mmakefile.src index 029a1ccac..1d1825973 100644 --- a/MultiMedia/AMP2/plugin/real/mmakefile.src +++ b/MultiMedia/AMP2/plugin/real/mmakefile.src @@ -14,7 +14,7 @@ MAIN = loadelf real OBJS = $(MAIN) $(COMMON) -EXEDIR := $(CONTRIBDIR)/MultiMedia/AMP2/Plugin +EXEDIR := $(AROS_CONTRIB)/MultiMedia/AMP2/Plugin USER_CFLAGS := -I$(SRCDIR)/$(CURDIR)/../../common -I$(SRCDIR)/$(CURDIR)/../../aros diff --git a/MultiMedia/AMP2/plugin/svq1/mmakefile.src b/MultiMedia/AMP2/plugin/svq1/mmakefile.src index 6a289ed27..b86683930 100644 --- a/MultiMedia/AMP2/plugin/svq1/mmakefile.src +++ b/MultiMedia/AMP2/plugin/svq1/mmakefile.src @@ -14,7 +14,7 @@ MAIN = svq1 OBJS = $(MAIN) $(COMMON) -EXEDIR := $(CONTRIBDIR)/MultiMedia/AMP2/Plugin +EXEDIR := $(AROS_CONTRIB)/MultiMedia/AMP2/Plugin USER_CFLAGS := -I$(SRCDIR)/$(CURDIR)/../../common -I$(SRCDIR)/$(CURDIR)/../../aros diff --git a/MultiMedia/AMP2/plugin/twos/mmakefile.src b/MultiMedia/AMP2/plugin/twos/mmakefile.src index afc1384f3..f46f23c44 100644 --- a/MultiMedia/AMP2/plugin/twos/mmakefile.src +++ b/MultiMedia/AMP2/plugin/twos/mmakefile.src @@ -14,7 +14,7 @@ MAIN = main OBJS = $(MAIN) $(COMMON) -EXEDIR := $(CONTRIBDIR)/MultiMedia/AMP2/Plugin +EXEDIR := $(AROS_CONTRIB)/MultiMedia/AMP2/Plugin USER_CFLAGS := -I$(SRCDIR)/$(CURDIR)/../../common -I$(SRCDIR)/$(CURDIR)/../../aros diff --git a/MultiMedia/AMP2/plugin/xanim/mmakefile.src b/MultiMedia/AMP2/plugin/xanim/mmakefile.src index e47f48e26..a8a7521c9 100644 --- a/MultiMedia/AMP2/plugin/xanim/mmakefile.src +++ b/MultiMedia/AMP2/plugin/xanim/mmakefile.src @@ -14,7 +14,7 @@ MAIN = loadelf xanim OBJS = $(MAIN) $(COMMON) -EXEDIR := $(CONTRIBDIR)/MultiMedia/AMP2/Plugin +EXEDIR := $(AROS_CONTRIB)/MultiMedia/AMP2/Plugin USER_CFLAGS := -I$(SRCDIR)/$(CURDIR)/../../common -I$(SRCDIR)/$(CURDIR)/../../aros diff --git a/MultiMedia/radium/mmakefile.src b/MultiMedia/radium/mmakefile.src index 7153baf1b..98b658097 100644 --- a/MultiMedia/radium/mmakefile.src +++ b/MultiMedia/radium/mmakefile.src @@ -107,7 +107,7 @@ OBJ= $(OBJ1) $(OBJ2) $(OBJ3) $(OBJ4) $(OBJ5) $(OBJ6) $(OBJ7) $(OBJ8) $(OBJ9) $( FILES := $(OBJ) -EXEDIR := $(CONTRIBDIR)/MultiMedia/Audio/Radium +EXEDIR := $(AROS_CONTRIB)/MultiMedia/Audio/Radium USER_CFLAGS := -I$(SRCDIR)/$(CURDIR)/$(AD) -I$(SRCDIR)/$(CURDIR)/$(AR) \ -I$(SRCDIR)/$(CURDIR)/$(CD) $(DEFINES) @@ -117,7 +117,7 @@ USER_CFLAGS := -I$(SRCDIR)/$(CURDIR)/$(AD) -I$(SRCDIR)/$(CURDIR)/$(AR) \ files=$(FILES) uselibs="realtime" #MM -setup-contrib-radium : setup $(CONTRIBDIR)/radium/Execute.Me +setup-contrib-radium : setup $(AROS_CONTRIB)/radium/Execute.Me -$(CONTRIBDIR)/radium/Execute.Me : RADIUM.RUN +$(AROS_CONTRIB)/radium/Execute.Me : RADIUM.RUN $(CP) $< $@ diff --git a/Networking/Apps/AiRcOS/catalogs/mmakefile.src b/Networking/Apps/AiRcOS/catalogs/mmakefile.src index c1767f7b4..23254c09e 100644 --- a/Networking/Apps/AiRcOS/catalogs/mmakefile.src +++ b/Networking/Apps/AiRcOS/catalogs/mmakefile.src @@ -3,7 +3,7 @@ include $(TOP)/config/make.cfg -CATDIR := $(CONTRIBDIR)/Networking/Apps/AiRcOS/Catalogs +CATDIR := $(AROS_CONTRIB)/Networking/Apps/AiRcOS/Catalogs #MM aros-tcpip-apps-aircos-catalogs diff --git a/Networking/Apps/AiRcOS/icons/mmakefile.src b/Networking/Apps/AiRcOS/icons/mmakefile.src index 2ba34d74b..c8ec678ea 100644 --- a/Networking/Apps/AiRcOS/icons/mmakefile.src +++ b/Networking/Apps/AiRcOS/icons/mmakefile.src @@ -2,7 +2,7 @@ include $(TOP)/config/make.cfg FILES := font_back font_bold font_color font_def font_ital font_large font_small font_under pop_pic pop_smiley pop_url img_speek -IMGDIR := $(CONTRIBDIR)/Networking/Apps/AiRcOS/Icons +IMGDIR := $(AROS_CONTRIB)/Networking/Apps/AiRcOS/Icons %copy_files_q mmake=aros-tcpip-apps-aircos-gadgets files=$(FILES) dst=$(IMGDIR) diff --git a/Networking/Apps/AiRcOS/mmakefile.src b/Networking/Apps/AiRcOS/mmakefile.src index 29ed09c43..38352e5dc 100644 --- a/Networking/Apps/AiRcOS/mmakefile.src +++ b/Networking/Apps/AiRcOS/mmakefile.src @@ -6,7 +6,7 @@ include $(TOP)/config/make.cfg FILES := locale aircos_main aircos_gui aircos_server_gui aircos_funcs_irc aircos_prefs aircos_funcs_dcc -EXEDIR := $(CONTRIBDIR)/Networking/Apps/AiRcOS +EXEDIR := $(AROS_CONTRIB)/Networking/Apps/AiRcOS USER_CFLAGS := -Wno-uninitialized -Wno-parentheses -D__BSD_VISIBLE=1 diff --git a/Networking/Apps/MarranoFTP/mmakefile.src b/Networking/Apps/MarranoFTP/mmakefile.src index 8b31f7198..b28b486aa 100644 --- a/Networking/Apps/MarranoFTP/mmakefile.src +++ b/Networking/Apps/MarranoFTP/mmakefile.src @@ -6,7 +6,7 @@ include $(TOP)/config/make.cfg FILES := main -EXEDIR := $(CONTRIBDIR)/Networking/Apps/MarranoFTP +EXEDIR := $(AROS_CONTRIB)/Networking/Apps/MarranoFTP USER_CFLAGS := -Wno-uninitialized -Wno-parentheses -D__BSD_VISIBLE=1 diff --git a/Networking/Apps/OWB/catalogs/mmakefile.src b/Networking/Apps/OWB/catalogs/mmakefile.src index 3909245f4..ea769ea35 100644 --- a/Networking/Apps/OWB/catalogs/mmakefile.src +++ b/Networking/Apps/OWB/catalogs/mmakefile.src @@ -1,6 +1,6 @@ include $(TOP)/config/make.cfg -EXEDIR := $(CONTRIBDIR)/Networking/Apps/OWB +EXEDIR := $(AROS_CONTRIB)/Networking/Apps/OWB CATDIR := $(EXEDIR)/Catalogs #MM- aros-tcpip-apps-owb-catalogs : aros-tcpip-apps-owb-catalogs-owb diff --git a/Networking/Apps/OWB/mmakefile.src b/Networking/Apps/OWB/mmakefile.src index afdd04b81..822295576 100644 --- a/Networking/Apps/OWB/mmakefile.src +++ b/Networking/Apps/OWB/mmakefile.src @@ -3,7 +3,7 @@ include $(TOP)/config/make.cfg -EXEDIR := $(CONTRIBDIR)/Networking/Apps/OWB +EXEDIR := $(AROS_CONTRIB)/Networking/Apps/OWB USER_CFLAGS := -DZUNE_BUILTIN_SCROLLGROUP=0 -DWTF_PLATFORM_AROS=1 diff --git a/Networking/Apps/amosaic/src/mmakefile.src b/Networking/Apps/amosaic/src/mmakefile.src index 6d621abbc..3c2e49d7a 100644 --- a/Networking/Apps/amosaic/src/mmakefile.src +++ b/Networking/Apps/amosaic/src/mmakefile.src @@ -38,7 +38,7 @@ FILES := globals \ # rexx # -EXEDIR := $(CONTRIBDIR)/Networking/Apps/AMosaic +EXEDIR := $(AROS_CONTRIB)/Networking/Apps/AMosaic USER_INCLUDES := -I$(SRCDIR)/$(CURDIR)/../libwww2 diff --git a/Networking/Apps/telnet/ttel/mmakefile.src b/Networking/Apps/telnet/ttel/mmakefile.src index 03a173729..15b74fb72 100644 --- a/Networking/Apps/telnet/ttel/mmakefile.src +++ b/Networking/Apps/telnet/ttel/mmakefile.src @@ -9,7 +9,7 @@ USER_CFLAGS := \ -DDIRECTED_BROADCAST \ -D__BSD_VISIBLE=1 -EXEDIR := $(CONTRIBDIR)/Networking/Apps/ttel +EXEDIR := $(AROS_CONTRIB)/Networking/Apps/ttel %build_prog mmake=aros-tcpip-apps-ttel \ progname=ttel targetdir=$(EXEDIR) \ diff --git a/Networking/Apps/tinyirc122/mmakefile.src b/Networking/Apps/tinyirc122/mmakefile.src index 7306fd6b1..1ab56f01f 100644 --- a/Networking/Apps/tinyirc122/mmakefile.src +++ b/Networking/Apps/tinyirc122/mmakefile.src @@ -9,7 +9,7 @@ USER_CFLAGS := \ -DDIRECTED_BROADCAST \ -D__BSD_VISIBLE=1 -EXEDIR := $(CONTRIBDIR)/Networking/Apps/TinyIRC +EXEDIR := $(AROS_CONTRIB)/Networking/Apps/TinyIRC %build_prog mmake=aros-tcpip-apps-tinyirc \ progname=TinyIRC targetdir=$(EXEDIR)/ \ diff --git a/Networking/Developer/Tests/basics/mmakefile.src b/Networking/Developer/Tests/basics/mmakefile.src index 03e73897f..ad8f5a9f8 100644 --- a/Networking/Developer/Tests/basics/mmakefile.src +++ b/Networking/Developer/Tests/basics/mmakefile.src @@ -8,7 +8,7 @@ TFILES = accept nonblock send sockbind USER_CFLAGS := -D__BSD_VISIBLE=1 %build_progs mmake=contrib-net-developer-basictests \ - files="$(TFILES)" targetdir=$(CONTRIBDIR)/Networking/Tests + files="$(TFILES)" targetdir=$(AROS_CONTRIB)/Networking/Tests ##MM contrib-net-developer-basictests : aros-tcpip diff --git a/Networking/Developer/Tests/mmakefile.src b/Networking/Developer/Tests/mmakefile.src index 3f7956dfc..8de704ae0 100644 --- a/Networking/Developer/Tests/mmakefile.src +++ b/Networking/Developer/Tests/mmakefile.src @@ -12,7 +12,7 @@ USER_CFLAGS := -D__BSD_VISIBLE=1 %build_progs mmake=contrib-net-developer-tests \ files="$(TFILES) $(STACKTESTS) $(CLISERVTESTS)" \ - targetdir=$(CONTRIBDIR)/Networking/Tests + targetdir=$(AROS_CONTRIB)/Networking/Tests ##MM contrib-net-developer-tests : aros-tcpip diff --git a/Networking/Stacks/lwip/lwip/proj/amigaos/mmakefile.src b/Networking/Stacks/lwip/lwip/proj/amigaos/mmakefile.src index d713303dc..20321fe3f 100644 --- a/Networking/Stacks/lwip/lwip/proj/amigaos/mmakefile.src +++ b/Networking/Stacks/lwip/lwip/proj/amigaos/mmakefile.src @@ -30,7 +30,7 @@ localdata #FLAGS = -specs=/home/cvs/AROS/bin/linux-i386/gen/config/specs FILES = $(COREOBJS) $(ARCHOBJS) $(NETIFOBJS) $(APIOBJS) $(LIBOBJS) test -EXEDIR := $(CONTRIBDIR)/lwip +EXEDIR := $(AROS_CONTRIB)/lwip USER_CFLAGS := -DLWIP_DEBUG -O2 -I$(SRCDIR)/include -I$(ARCHINCLUDE) -I$(IPVXINCLUDE) -I./ -I./include \ -D__BSD_VISIBLE=1 diff --git a/Networking/Utils/SANAUtil/mmakefile.src b/Networking/Utils/SANAUtil/mmakefile.src index cefe0024f..fb02de716 100644 --- a/Networking/Utils/SANAUtil/mmakefile.src +++ b/Networking/Utils/SANAUtil/mmakefile.src @@ -9,11 +9,11 @@ USER_CFLAGS := -Wno-uninitialized -Wno-parentheses %build_prog mmake=contrib-networking-utils-sanautil \ progname="SANAUtil" \ files="SANAUtil" \ - targetdir="$(CONTRIBDIR)/Networking/Utils/SANAUtil" + targetdir="$(AROS_CONTRIB)/Networking/Utils/SANAUtil" %copy_files_q mmake=contrib-networking-utils-sanautil-cpy files="SANAUtil.doc" \ - dst="$(CONTRIBDIR)/Networking/Utils/SANAUtil" + dst="$(AROS_CONTRIB)/Networking/Utils/SANAUtil" %common diff --git a/Networking/Utils/daytime/mmakefile.src b/Networking/Utils/daytime/mmakefile.src index d3beb7822..356f04bf9 100644 --- a/Networking/Utils/daytime/mmakefile.src +++ b/Networking/Utils/daytime/mmakefile.src @@ -5,7 +5,7 @@ USER_CFLAGS := -Wno-uninitialized -Wno-parentheses -D__BSD_VISIBLE=1 %build_progs mmake=contrib-networking-utils-daytime \ files="daytime dayserv" \ - targetdir="$(CONTRIBDIR)/Networking/Utils/daytime" + targetdir="$(AROS_CONTRIB)/Networking/Utils/daytime" %common diff --git a/aminet/GadgetTest/mmakefile.src b/aminet/GadgetTest/mmakefile.src index b5f1b5796..3a4d5c4b5 100644 --- a/aminet/GadgetTest/mmakefile.src +++ b/aminet/GadgetTest/mmakefile.src @@ -1,6 +1,6 @@ include $(TOP)/config/make.cfg %build_prog mmake=aminet-gadgettest \ - progname=GadgetTest targetdir=$(CONTRIBDIR)/Misc/aminet \ + progname=GadgetTest targetdir=$(AROS_CONTRIB)/Misc/aminet \ files=GadgetTest diff --git a/aminet/comm/amitcp/mmakefile.src b/aminet/comm/amitcp/mmakefile.src index 44ef65bc6..a136f93c0 100644 --- a/aminet/comm/amitcp/mmakefile.src +++ b/aminet/comm/amitcp/mmakefile.src @@ -29,7 +29,7 @@ API:= api/amiga_api api/amiga_libtables api/amiga_syscalls\ FILES := $(NET) $(KERN) $(NETINET) $(API) -EXEDIR := $(CONTRIBDIR)/aminet +EXEDIR := $(AROS_CONTRIB)/aminet USER_DEFINES:= -DRCS_ID_C=// -DAMITCP -DKERNEL -DNO_DEBUG -DNDEBUG\ -DNO_ARP_DEBUG -DNO_TCPDEBUG -DNO_ICMPPRINTFS -DNO_SOCKBUF_DEBUG -DAROS diff --git a/aminet/comm/term/MicroTerm/mmakefile.src b/aminet/comm/term/MicroTerm/mmakefile.src index 3d3366fd9..030e32d8d 100644 --- a/aminet/comm/term/MicroTerm/mmakefile.src +++ b/aminet/comm/term/MicroTerm/mmakefile.src @@ -1,5 +1,5 @@ include $(TOP)/config/make.cfg %build_prog mmake=aminet-comm-term-microtem \ - progname=Microterm targetdir=$(CONTRIBDIR)/Misc/aminet \ + progname=Microterm targetdir=$(AROS_CONTRIB)/Misc/aminet \ files="console globals main serial" diff --git a/aminet/comm/term/TinyTerminal/mmakefile.src b/aminet/comm/term/TinyTerminal/mmakefile.src index 9d9956b60..af03451df 100644 --- a/aminet/comm/term/TinyTerminal/mmakefile.src +++ b/aminet/comm/term/TinyTerminal/mmakefile.src @@ -1,5 +1,5 @@ include $(TOP)/config/make.cfg %build_prog mmake=aminet-comm-term-tinyterminal \ - progname=TinyTerminal targetdir=$(CONTRIBDIR)/Misc/aminet \ + progname=TinyTerminal targetdir=$(AROS_CONTRIB)/Misc/aminet \ files=tt diff --git a/aminet/comm/term/amigaterm/mmakefile.src b/aminet/comm/term/amigaterm/mmakefile.src index ef2fe53b6..c6f0b8441 100644 --- a/aminet/comm/term/amigaterm/mmakefile.src +++ b/aminet/comm/term/amigaterm/mmakefile.src @@ -1,5 +1,5 @@ include $(TOP)/config/make.cfg %build_prog mmake=aminet-comm-term-amigaterm \ - progname=amigaterm targetdir=$(CONTRIBDIR)/Misc/aminet \ + progname=amigaterm targetdir=$(AROS_CONTRIB)/Misc/aminet \ files=amigaterm diff --git a/aminet/comm/term/term/Extras/Source/mmakefile.src b/aminet/comm/term/term/Extras/Source/mmakefile.src index 84aa425f6..90e4fbf30 100644 --- a/aminet/comm/term/term/Extras/Source/mmakefile.src +++ b/aminet/comm/term/term/Extras/Source/mmakefile.src @@ -135,7 +135,7 @@ FILES := \ USER_CFLAGS = -DINCLUDEALL -DCPU_ANY -Wno-parentheses %build_prog mmake=aminet-comm-term-term \ - progname=Term targetdir=$(CONTRIBDIR)/Misc/aminet \ + progname=Term targetdir=$(AROS_CONTRIB)/Misc/aminet \ files=$(FILES) uselibs="gtlayout" #MM aminet-comm-term-term : aminet-dev-gui-gtlayout aminet-comm-term-xprz aminet-comm-term-xem setup-aminet-comm-term-term diff --git a/aminet/comm/term/termLite/mmakefile.src b/aminet/comm/term/termLite/mmakefile.src index faa5de930..940d2c2ac 100644 --- a/aminet/comm/term/termLite/mmakefile.src +++ b/aminet/comm/term/termLite/mmakefile.src @@ -1,5 +1,5 @@ include $(TOP)/config/make.cfg %build_prog mmake=aminet-comm-term-termlite \ - progname=termLite targetdir=$(CONTRIBDIR)/Misc/aminet \ + progname=termLite targetdir=$(AROS_CONTRIB)/Misc/aminet \ files=termLite diff --git a/aminet/comm/term/xemlibs/xem/mmakefile.src b/aminet/comm/term/xemlibs/xem/mmakefile.src index af4f5788c..baab61651 100644 --- a/aminet/comm/term/xemlibs/xem/mmakefile.src +++ b/aminet/comm/term/xemlibs/xem/mmakefile.src @@ -2,7 +2,7 @@ include $(TOP)/config/make.cfg LOCALINCLUDES = -I$(SRCDIR)/$(CURDIR) -I$(SRCDIR)/$(CURDIR)/../Include -LIBS := -L$(LIBDIR) -lamiga +LIBS := -L$(AROS_LIB) -lamiga $(AROS_INCLUDES)/defines/xem.h : aros/xem_defines.h diff --git a/aminet/dev/basic/bwBASIC/mmakefile.src b/aminet/dev/basic/bwBASIC/mmakefile.src index 09ad3ec20..21123477b 100644 --- a/aminet/dev/basic/bwBASIC/mmakefile.src +++ b/aminet/dev/basic/bwBASIC/mmakefile.src @@ -8,7 +8,7 @@ FILES := bwbasic bwb_int bwb_tbl bwb_cmd bwb_prn\ bwb_exp bwb_var bwb_inp bwb_fnc bwb_cnd\ bwb_ops bwb_dio bwb_str bwb_elx bwb_mth -EXEDIR := $(CONTRIBDIR)/Misc/aminet +EXEDIR := $(AROS_CONTRIB)/Misc/aminet %build_prog mmake=aminet-dev-basic-bwBASIC \ progname=bwbasic targetdir=$(EXEDIR) \ diff --git a/aminet/dev/src/HexDump/mmakefile.src b/aminet/dev/src/HexDump/mmakefile.src index 013965c75..1529f31c1 100644 --- a/aminet/dev/src/HexDump/mmakefile.src +++ b/aminet/dev/src/HexDump/mmakefile.src @@ -1,6 +1,6 @@ include $(TOP)/config/make.cfg %build_prog mmake=aminet-dev-src-hexdump \ - progname=HexDump targetdir=$(CONTRIBDIR)/Misc/aminet \ + progname=HexDump targetdir=$(AROS_CONTRIB)/Misc/aminet \ files=HexDump diff --git a/aminet/dev/src/RABLe/compile/mmakefile.src b/aminet/dev/src/RABLe/compile/mmakefile.src index 1e89b7f4d..d83e81169 100644 --- a/aminet/dev/src/RABLe/compile/mmakefile.src +++ b/aminet/dev/src/RABLe/compile/mmakefile.src @@ -1,5 +1,5 @@ include $(TOP)/config/make.cfg %build_prog mmake=aminet-dev-src-rable \ - progname=rable targetdir=$(CONTRIBDIR)/Misc/aminet \ + progname=rable targetdir=$(AROS_CONTRIB)/Misc/aminet \ files="rable_draw rable_gadgets rable" diff --git a/aminet/disk/misc/Mtools-2.0.7/mmakefile.src b/aminet/disk/misc/Mtools-2.0.7/mmakefile.src index e1bfce9c5..fade7f96c 100644 --- a/aminet/disk/misc/Mtools-2.0.7/mmakefile.src +++ b/aminet/disk/misc/Mtools-2.0.7/mmakefile.src @@ -1,6 +1,6 @@ include $(TOP)/config/make.cfg -DESTDIR := $(CONTRIBDIR)/Misc/aminet/disk/misc/Mtools-2.0.7 +DESTDIR := $(AROS_CONTRIB)/Misc/aminet/disk/misc/Mtools-2.0.7 SRCDIR := src/ diff --git a/aminet/disk/moni/filex/locale/mmakefile.src b/aminet/disk/moni/filex/locale/mmakefile.src index f4c880dab..444dce824 100644 --- a/aminet/disk/moni/filex/locale/mmakefile.src +++ b/aminet/disk/moni/filex/locale/mmakefile.src @@ -1,6 +1,6 @@ include $(TOP)/config/make.cfg -DESTDIR := $(CONTRIBDIR)/Misc/aminet/FileX/Catalogs +DESTDIR := $(AROS_CONTRIB)/Misc/aminet/FileX/Catalogs CATALOGS := $(basename $(call WILDCARD, *.ct)) CATDESC := FileX diff --git a/aminet/disk/moni/filex/mmakefile.src b/aminet/disk/moni/filex/mmakefile.src index 3192fe83b..ee1f3a964 100644 --- a/aminet/disk/moni/filex/mmakefile.src +++ b/aminet/disk/moni/filex/mmakefile.src @@ -38,7 +38,7 @@ USER_CFLAGS := -DUSE_PROTO_INCLUDES \ -D__stdargs="" \ -D__asm="" -EXEDIR := $(CONTRIBDIR)/Misc/aminet/FileX +EXEDIR := $(AROS_CONTRIB)/Misc/aminet/FileX #MM aminet-disk-moni-filex : includes linklibs setup-filex-catalogs diff --git a/aminet/games/board/Backgammon/mmakefile.src b/aminet/games/board/Backgammon/mmakefile.src index 40676ce04..05fa43331 100644 --- a/aminet/games/board/Backgammon/mmakefile.src +++ b/aminet/games/board/Backgammon/mmakefile.src @@ -1,6 +1,6 @@ include $(TOP)/config/make.cfg -EXEDIR := $(CONTRIBDIR)/Games/Backgammon +EXEDIR := $(AROS_CONTRIB)/Games/Backgammon %build_prog mmake=aminet-games-board-backgammon \ progname=Backgammon targetdir=$(EXEDIR) \ diff --git a/aminet/games/shoot/inv/mmakefile.src b/aminet/games/shoot/inv/mmakefile.src index 3e08482f6..00207564e 100644 --- a/aminet/games/shoot/inv/mmakefile.src +++ b/aminet/games/shoot/inv/mmakefile.src @@ -1,6 +1,6 @@ include $(TOP)/config/make.cfg -EXEDIR := $(CONTRIBDIR)/Games/Inv +EXEDIR := $(AROS_CONTRIB)/Games/Inv %build_prog mmake=aminet-games-shoot-inv \ progname=Inv targetdir=$(EXEDIR) \ diff --git a/aminet/games/think/amichess/mmakefile.src b/aminet/games/think/amichess/mmakefile.src index 30c2c9005..2ca642444 100644 --- a/aminet/games/think/amichess/mmakefile.src +++ b/aminet/games/think/amichess/mmakefile.src @@ -2,7 +2,7 @@ include $(TOP)/config/make.cfg #MM- aminet-games-think-amichess : aminet-games-think-amichess-program aminet-games-think-amichess-datafiles -AMICHESSDIR := $(CONTRIBDIR)/Games/AmiChess +AMICHESSDIR := $(AROS_CONTRIB)/Games/AmiChess BOARDS := Crystal Default Fire Ice MarbleBrown MarbleGrey \ Metal Plasma Redwood Water Wood1 Wood2 diff --git a/aminet/games/think/amichess/src/mmakefile.src b/aminet/games/think/amichess/src/mmakefile.src index b29491ad5..37f2781d5 100644 --- a/aminet/games/think/amichess/src/mmakefile.src +++ b/aminet/games/think/amichess/src/mmakefile.src @@ -40,7 +40,7 @@ FILES := atak \ USER_CFLAGS := -DHAVE64BIT -EXEDIR := $(CONTRIBDIR)/Games/AmiChess +EXEDIR := $(AROS_CONTRIB)/Games/AmiChess #MM aminet-games-think-amichess-program : \ #MM contrib-zune-classes-nlist contrib-zune-classes-nlistview diff --git a/aminet/games/think/lazymines/catalogs/mmakefile.src b/aminet/games/think/lazymines/catalogs/mmakefile.src index 5e6a5b262..fe4a15856 100644 --- a/aminet/games/think/lazymines/catalogs/mmakefile.src +++ b/aminet/games/think/lazymines/catalogs/mmakefile.src @@ -1,6 +1,6 @@ include $(TOP)/config/make.cfg -DESTDIR := $(CONTRIBDIR)/Games/LazyMines/Catalogs +DESTDIR := $(AROS_CONTRIB)/Games/LazyMines/Catalogs CATALOGS := dansk deutsch italiano norsk polski svenska CATDESC := lazymines diff --git a/aminet/games/think/lazymines/mmakefile.src b/aminet/games/think/lazymines/mmakefile.src index e96f5be4c..99e8bf48c 100644 --- a/aminet/games/think/lazymines/mmakefile.src +++ b/aminet/games/think/lazymines/mmakefile.src @@ -4,7 +4,7 @@ include $(TOP)/config/make.cfg FILES := lazymines button counter field highscores images layout \ localize requesters timer tooltypes lazymines_strings -EXEDIR := $(CONTRIBDIR)/Games/LazyMines +EXEDIR := $(AROS_CONTRIB)/Games/LazyMines #MM aminet-games-think-lazymines : aminet-dev-src-chunkyiclass setup-aminet-lazymines-catalogs diff --git a/aminet/games/think/muimine/Images/mmakefile.src b/aminet/games/think/muimine/Images/mmakefile.src index 95b900e21..03f593996 100644 --- a/aminet/games/think/muimine/Images/mmakefile.src +++ b/aminet/games/think/muimine/Images/mmakefile.src @@ -27,7 +27,7 @@ IMAGES = \ def_FaceButtonImage \ def_MineFieldImage -EXEDIR := $(CONTRIBDIR)/Games/MUIMine +EXEDIR := $(AROS_CONTRIB)/Games/MUIMine IMAGEDIR := $(EXEDIR)/Images %copy_files_q mmake=setup-aminet-games-think-muimine-images files=$(IMAGES) src=. dst=$(IMAGEDIR) diff --git a/aminet/games/think/muimine/mmakefile.src b/aminet/games/think/muimine/mmakefile.src index d5328c875..4958af368 100644 --- a/aminet/games/think/muimine/mmakefile.src +++ b/aminet/games/think/muimine/mmakefile.src @@ -17,7 +17,7 @@ FILES := \ Digits -EXEDIR := $(CONTRIBDIR)/Games/MUIMine +EXEDIR := $(AROS_CONTRIB)/Games/MUIMine #MM aminet-games-think-muimine : setup-aminet-games-think-muimine-images diff --git a/aminet/games/think/newmastermind/catalogs/mmakefile.src b/aminet/games/think/newmastermind/catalogs/mmakefile.src index 64550a47f..aa216e684 100644 --- a/aminet/games/think/newmastermind/catalogs/mmakefile.src +++ b/aminet/games/think/newmastermind/catalogs/mmakefile.src @@ -1,6 +1,6 @@ include $(TOP)/config/make.cfg -DESTDIR := $(CONTRIBDIR)/Games/NewMasterMind/Catalogs +DESTDIR := $(AROS_CONTRIB)/Games/NewMasterMind/Catalogs CATALOGS := dansk svenska CATDESC := newmastermind diff --git a/aminet/games/think/newmastermind/mmakefile.src b/aminet/games/think/newmastermind/mmakefile.src index 2fa093acc..ddf60cbc2 100644 --- a/aminet/games/think/newmastermind/mmakefile.src +++ b/aminet/games/think/newmastermind/mmakefile.src @@ -1,6 +1,6 @@ include $(TOP)/config/make.cfg -EXEDIR := $(CONTRIBDIR)/Games/NewMasterMind +EXEDIR := $(AROS_CONTRIB)/Games/NewMasterMind %build_prog mmake=aminet-games-think-newmastermind \ progname=NewMasterMind targetdir=$(EXEDIR) \ diff --git a/aminet/games/think/soliton/common/mmakefile.src b/aminet/games/think/soliton/common/mmakefile.src index dbebc2d77..f36537776 100644 --- a/aminet/games/think/soliton/common/mmakefile.src +++ b/aminet/games/think/soliton/common/mmakefile.src @@ -17,7 +17,7 @@ FILES := About \ Statistics \ Cardgame -EXEDIR := $(CONTRIBDIR)/Games/Soliton +EXEDIR := $(AROS_CONTRIB)/Games/Soliton USER_INCLUDES := -I$(SRCDIR)/$(CURDIR)/../images USER_CFLAGS := -DUSE_ZUNE diff --git a/aminet/games/think/soliton/locale/mmakefile.src b/aminet/games/think/soliton/locale/mmakefile.src index 9d64d1143..d08e10327 100644 --- a/aminet/games/think/soliton/locale/mmakefile.src +++ b/aminet/games/think/soliton/locale/mmakefile.src @@ -5,4 +5,4 @@ include $(TOP)/config/make.cfg %build_catalogs mmake=setup-soliton-catalogs \ name=Soliton subdir= source=../common/Catalog.h \ - dir=$(CONTRIBDIR)/Games/Soliton/Catalogs + dir=$(AROS_CONTRIB)/Games/Soliton/Catalogs diff --git a/aminet/games/think/soliton/releasefiles/mmakefile.src b/aminet/games/think/soliton/releasefiles/mmakefile.src index 7ca0b1282..fdd7e8281 100644 --- a/aminet/games/think/soliton/releasefiles/mmakefile.src +++ b/aminet/games/think/soliton/releasefiles/mmakefile.src @@ -1,6 +1,6 @@ include $(TOP)/config/make.cfg -SOLITONDIR := $(CONTRIBDIR)/Games/Soliton +SOLITONDIR := $(AROS_CONTRIB)/Games/Soliton CARDS := Cards_Standard_Medium CARDDIR := $(SOLITONDIR)/Graphics diff --git a/aminet/games/think/yahzee/catalogs/mmakefile.src b/aminet/games/think/yahzee/catalogs/mmakefile.src index f54f32203..6e48fd9f4 100644 --- a/aminet/games/think/yahzee/catalogs/mmakefile.src +++ b/aminet/games/think/yahzee/catalogs/mmakefile.src @@ -1,6 +1,6 @@ include $(TOP)/config/make.cfg -DESTDIR := $(CONTRIBDIR)/Games/Yahzee/Catalogs +DESTDIR := $(AROS_CONTRIB)/Games/Yahzee/Catalogs CATALOGS := dansk deutsch nederlands suomi svenska CATDESC := yahzee diff --git a/aminet/games/think/yahzee/mmakefile.src b/aminet/games/think/yahzee/mmakefile.src index 1d6226e0c..6e4691160 100644 --- a/aminet/games/think/yahzee/mmakefile.src +++ b/aminet/games/think/yahzee/mmakefile.src @@ -1,6 +1,6 @@ include $(TOP)/config/make.cfg -EXEDIR := $(CONTRIBDIR)/Games/Yahzee +EXEDIR := $(AROS_CONTRIB)/Games/Yahzee FILES := dice draw game highscores layout localize requesters rules tooltypes \ yahzee yahzee_strings diff --git a/aminet/mus/midi/CAMD_Toolkit/Fireworks/Source/mmakefile.src b/aminet/mus/midi/CAMD_Toolkit/Fireworks/Source/mmakefile.src index 9bb454f14..803ac3c68 100644 --- a/aminet/mus/midi/CAMD_Toolkit/Fireworks/Source/mmakefile.src +++ b/aminet/mus/midi/CAMD_Toolkit/Fireworks/Source/mmakefile.src @@ -5,7 +5,7 @@ include $(TOP)/config/make.cfg FILES := fireworks async message timer libopen stubs fwmodes linear parabolic -EXEDIR := $(CONTRIBDIR)/Misc/aminet +EXEDIR := $(AROS_CONTRIB)/Misc/aminet # -DNO_INLINE_STDARG diff --git a/aminet/mus/midi/CAMD_Toolkit/PlayMF/Source/mmakefile.src b/aminet/mus/midi/CAMD_Toolkit/PlayMF/Source/mmakefile.src index 3ab9aba2b..801256e84 100644 --- a/aminet/mus/midi/CAMD_Toolkit/PlayMF/Source/mmakefile.src +++ b/aminet/mus/midi/CAMD_Toolkit/PlayMF/Source/mmakefile.src @@ -5,7 +5,7 @@ include $(TOP)/config/make.cfg FILES := PlayMF filter divdi3 qdivrem -EXEDIR := $(CONTRIBDIR)/Misc/aminet +EXEDIR := $(AROS_CONTRIB)/Misc/aminet USER_CFLAGS := -D_QUAD_HIGHWORD=1 -D_QUAD_LOWWORD=0 -D__BSD_VISIBLE=1 #MM aminet-mus-midi-CAMD_Toolkit-PlayMF : setup-aminet-mus-midi-CAMD_Toolkit-PlayMF diff --git a/aminet/text/edit/xdme/mmakefile.src b/aminet/text/edit/xdme/mmakefile.src index 67cd40816..3565e9eda 100644 --- a/aminet/text/edit/xdme/mmakefile.src +++ b/aminet/text/edit/xdme/mmakefile.src @@ -20,7 +20,7 @@ FILES := $(filter-out %_SPC_,$(subst .c,,$(wildcard Src/*.c Src/*/*.c))) ## ## XDME -EXEDIR := $(CONTRIBDIR)/Misc/aminet/XDME +EXEDIR := $(AROS_CONTRIB)/Misc/aminet/XDME #MM aminet-text-edit-xdme-quick : setup-xdme #MM aminet-text-edit-xdme : setup-xdme diff --git a/aminet/text/misc/Typeface/catalogs/mmakefile.src b/aminet/text/misc/Typeface/catalogs/mmakefile.src index 4921b40ad..b8148b950 100644 --- a/aminet/text/misc/Typeface/catalogs/mmakefile.src +++ b/aminet/text/misc/Typeface/catalogs/mmakefile.src @@ -5,4 +5,4 @@ include $(TOP)/config/make.cfg %build_catalogs mmake=setup-typeface-catalogs \ name=Typeface subdir= source=../locale.h \ - dir=$(CONTRIBDIR)/Misc/aminet/Typeface/Catalogs + dir=$(AROS_CONTRIB)/Misc/aminet/Typeface/Catalogs diff --git a/aminet/text/misc/Typeface/mmakefile.src b/aminet/text/misc/Typeface/mmakefile.src index 37a740325..86fcfcb40 100644 --- a/aminet/text/misc/Typeface/mmakefile.src +++ b/aminet/text/misc/Typeface/mmakefile.src @@ -7,7 +7,7 @@ include $(TOP)/config/make.cfg FILES := char checkbox error node locale \ gadget text fontio typeface -EXEDIR := $(CONTRIBDIR)/Misc/aminet/Typeface +EXEDIR := $(AROS_CONTRIB)/Misc/aminet/Typeface USER_CFLAGS := -DINTUITION_NO_INLINE_STDARG \ -Wno-unused-function $(FORMAT_SECURITY_CFLAGS) diff --git a/aminet/util/arc/bzip2/mmakefile.src b/aminet/util/arc/bzip2/mmakefile.src index 1a0839919..7bffcebd7 100644 --- a/aminet/util/arc/bzip2/mmakefile.src +++ b/aminet/util/arc/bzip2/mmakefile.src @@ -16,7 +16,7 @@ FILES := \ USER_CFLAGS = -D_FILE_OFFSET_BITS=32 -EXEDIR := $(CONTRIBDIR)/Misc/aminet/C +EXEDIR := $(AROS_CONTRIB)/Misc/aminet/C %build_prog mmake=aminet-util-arc-bzip2 \ progname=bzip2 targetdir=$(EXEDIR) \ diff --git a/aminet/util/arc/lha/mmakefile.src b/aminet/util/arc/lha/mmakefile.src index 14acc01c7..86aeec7fb 100644 --- a/aminet/util/arc/lha/mmakefile.src +++ b/aminet/util/arc/lha/mmakefile.src @@ -7,7 +7,7 @@ include $(TOP)/config/make.cfg FILES := append extract larc lhext maketree slide crcio header lhadd\ lhlist patmatch dhuf huf lharc maketbl shuf util -EXEDIR := $(CONTRIBDIR)/Misc/aminet/C +EXEDIR := $(AROS_CONTRIB)/Misc/aminet/C USER_CFLAGS := -DAROS diff --git a/aminet/util/arc/testdms/mmakefile.src b/aminet/util/arc/testdms/mmakefile.src index 1151c5aa2..517a64131 100644 --- a/aminet/util/arc/testdms/mmakefile.src +++ b/aminet/util/arc/testdms/mmakefile.src @@ -1,5 +1,5 @@ include $(TOP)/config/make.cfg %build_prog mmake=aminet-util-arc-testdms \ - progname=testdms targetdir=$(CONTRIBDIR)/Misc/aminet \ + progname=testdms targetdir=$(AROS_CONTRIB)/Misc/aminet \ files=testdms diff --git a/aminet/util/arc/unace/mmakefile.src b/aminet/util/arc/unace/mmakefile.src index f34acf9df..cc2a60809 100644 --- a/aminet/util/arc/unace/mmakefile.src +++ b/aminet/util/arc/unace/mmakefile.src @@ -2,7 +2,7 @@ include $(TOP)/config/make.cfg FILES := uac_crc globals uac_crt unace uac_sys uac_dcpr uac_comm -EXEDIR := $(CONTRIBDIR)/Misc/aminet/C +EXEDIR := $(AROS_CONTRIB)/Misc/aminet/C USER_CFLAGS := -DUNIX -UAMIGA -U_AMIGA $(FORMAT_SECURITY_CFLAGS) diff --git a/aminet/util/arc/unarj/mmakefile.src b/aminet/util/arc/unarj/mmakefile.src index 9eda8870c..80128fab5 100644 --- a/aminet/util/arc/unarj/mmakefile.src +++ b/aminet/util/arc/unarj/mmakefile.src @@ -6,7 +6,7 @@ include $(TOP)/config/make.cfg FILES := decode environ unarj -EXEDIR := $(CONTRIBDIR)/Misc/aminet/C +EXEDIR := $(AROS_CONTRIB)/Misc/aminet/C #MM aminet-util-arc-unarj : includes linklibs diff --git a/aminet/util/arc/undms/mmakefile.src b/aminet/util/arc/undms/mmakefile.src index 5a2ceee82..9b1d9ec62 100644 --- a/aminet/util/arc/undms/mmakefile.src +++ b/aminet/util/arc/undms/mmakefile.src @@ -1,5 +1,5 @@ include $(TOP)/config/make.cfg %build_prog mmake=aminet-util-arc-undms \ - progname=undms targetdir=$(CONTRIBDIR)/Misc/aminet/C \ + progname=undms targetdir=$(AROS_CONTRIB)/Misc/aminet/C \ files=undms diff --git a/aminet/util/arc/unlzx/mmakefile.src b/aminet/util/arc/unlzx/mmakefile.src index f8ee5e282..ed6387d7c 100644 --- a/aminet/util/arc/unlzx/mmakefile.src +++ b/aminet/util/arc/unlzx/mmakefile.src @@ -1,5 +1,5 @@ include $(TOP)/config/make.cfg %build_prog mmake=aminet-util-arc-unlzx \ - progname=unlzx targetdir=$(CONTRIBDIR)/Misc/aminet/C \ + progname=unlzx targetdir=$(AROS_CONTRIB)/Misc/aminet/C \ files=unlzx diff --git a/aminet/util/arc/unrar/mmakefile.src b/aminet/util/arc/unrar/mmakefile.src index 7bf2e6a5f..c6d5ee95a 100644 --- a/aminet/util/arc/unrar/mmakefile.src +++ b/aminet/util/arc/unrar/mmakefile.src @@ -2,7 +2,7 @@ include $(TOP)/config/make.cfg FILES := unrar -EXEDIR := $(CONTRIBDIR)/Misc/aminet/C +EXEDIR := $(AROS_CONTRIB)/Misc/aminet/C USER_CFLAGS :=-D_UNIX diff --git a/aminet/util/arc/unshar/mmakefile.src b/aminet/util/arc/unshar/mmakefile.src index 557384f0f..4b35e44bd 100644 --- a/aminet/util/arc/unshar/mmakefile.src +++ b/aminet/util/arc/unshar/mmakefile.src @@ -6,7 +6,7 @@ include $(TOP)/config/make.cfg FILES := unshar -EXEDIR := $(CONTRIBDIR)/Misc/aminet/C +EXEDIR := $(AROS_CONTRIB)/Misc/aminet/C #MM aminet-util-arc-unshar : includes linklibs diff --git a/aminet/util/arc/unsit/mmakefile.src b/aminet/util/arc/unsit/mmakefile.src index fa0e5fa8e..ead833906 100644 --- a/aminet/util/arc/unsit/mmakefile.src +++ b/aminet/util/arc/unsit/mmakefile.src @@ -6,7 +6,7 @@ include $(TOP)/config/make.cfg FILES := unsit updcrc -EXEDIR := $(CONTRIBDIR)/Misc/aminet/C +EXEDIR := $(AROS_CONTRIB)/Misc/aminet/C USER_CFLAGS := -DAROS -DHAVE_GETOPT=1 diff --git a/aminet/util/arc/untar/mmakefile.src b/aminet/util/arc/untar/mmakefile.src index 372b865a1..e86b34e42 100644 --- a/aminet/util/arc/untar/mmakefile.src +++ b/aminet/util/arc/untar/mmakefile.src @@ -6,7 +6,7 @@ include $(TOP)/config/make.cfg FILES := untar -EXEDIR := $(CONTRIBDIR)/Misc/aminet/C +EXEDIR := $(AROS_CONTRIB)/Misc/aminet/C #MM aminet-util-arc-untar : includes linklibs diff --git a/aminet/util/arc/untgz/mmakefile.src b/aminet/util/arc/untgz/mmakefile.src index db6692e18..74c686c13 100644 --- a/aminet/util/arc/untgz/mmakefile.src +++ b/aminet/util/arc/untgz/mmakefile.src @@ -6,7 +6,7 @@ include $(TOP)/config/make.cfg FILES := untgz -EXEDIR := $(CONTRIBDIR)/Misc/aminet/C +EXEDIR := $(AROS_CONTRIB)/Misc/aminet/C #MM aminet-util-arc-untgz : includes linklibs diff --git a/aminet/util/arc/zoo/mmakefile.src b/aminet/util/arc/zoo/mmakefile.src index 56682bb15..125a655d8 100644 --- a/aminet/util/arc/zoo/mmakefile.src +++ b/aminet/util/arc/zoo/mmakefile.src @@ -9,7 +9,7 @@ makelist misc misc2 nextfile needed options parse portable prterror version\ zoo zooadd zooadd2 zoodel zooext zoofilt zoolist zoopack io lzh maketbl\ maketree huf encode decode -EXEDIR := $(CONTRIBDIR)/Misc/aminet/C +EXEDIR := $(AROS_CONTRIB)/Misc/aminet/C USER_CFLAGS := -DGENERIC -DNOSIGNAL diff --git a/aminet/util/cli/sploiner/mmakefile.src b/aminet/util/cli/sploiner/mmakefile.src index c46df1279..6bc036bd5 100644 --- a/aminet/util/cli/sploiner/mmakefile.src +++ b/aminet/util/cli/sploiner/mmakefile.src @@ -1,7 +1,7 @@ include $(TOP)/config/make.cfg FILES := getbuff getopt join repair split sploiner usage -EXEDIR := $(CONTRIBDIR)/Misc/aminet +EXEDIR := $(AROS_CONTRIB)/Misc/aminet %build_prog mmake=contrib-aminet-util-cli-sploiner \ progname=sploiner targetdir=$(EXEDIR) \ diff --git a/aminet/util/dir/filemaster/catalogs/mmakefile.src b/aminet/util/dir/filemaster/catalogs/mmakefile.src index 38945fd52..156ff8d33 100644 --- a/aminet/util/dir/filemaster/catalogs/mmakefile.src +++ b/aminet/util/dir/filemaster/catalogs/mmakefile.src @@ -5,4 +5,4 @@ include $(TOP)/config/make.cfg %build_catalogs mmake=setup-filemaster-catalogs \ name=FileMaster subdir= source=../filemaster_strings.h \ - dir=$(CONTRIBDIR)/Misc/aminet/FileMaster/Catalogs + dir=$(AROS_CONTRIB)/Misc/aminet/FileMaster/Catalogs diff --git a/aminet/util/dir/filemaster/mmakefile.src b/aminet/util/dir/filemaster/mmakefile.src index 10eb1efae..f01afa1fe 100644 --- a/aminet/util/dir/filemaster/mmakefile.src +++ b/aminet/util/dir/filemaster/mmakefile.src @@ -11,7 +11,7 @@ FILES := about commodity config copy dir diskinfo drives event execute \ # does not work: audio -EXEDIR := $(CONTRIBDIR)/Misc/aminet/FileMaster +EXEDIR := $(AROS_CONTRIB)/Misc/aminet/FileMaster USER_CFLAGS := -DAROS -DV39 diff --git a/aminet/util/misc/reqattack/mmakefile.src b/aminet/util/misc/reqattack/mmakefile.src index 9ded91f75..b5736b991 100644 --- a/aminet/util/misc/reqattack/mmakefile.src +++ b/aminet/util/misc/reqattack/mmakefile.src @@ -29,7 +29,7 @@ FILES := addicon \ reqlist \ reqoffexec -EXEDIR := $(CONTRIBDIR)/Misc/aminet/ReqAttack +EXEDIR := $(AROS_CONTRIB)/Misc/aminet/ReqAttack USER_CFLAGS := -DNO_POPUPMENU -DNO_SOUND -DNO_ASM diff --git a/aminet/util/moni/SnoopDos/mmakefile.src b/aminet/util/moni/SnoopDos/mmakefile.src index 481bb0f14..269323b9f 100644 --- a/aminet/util/moni/SnoopDos/mmakefile.src +++ b/aminet/util/moni/SnoopDos/mmakefile.src @@ -4,5 +4,5 @@ FILES := buffer language subwin mainwin system hotkey \ settings miscwin patches snoopdos %build_prog mmake=aminet-util-moni-snoopdos \ - progname=SnoopDos targetdir=$(CONTRIBDIR)/Misc/aminet \ + progname=SnoopDos targetdir=$(AROS_CONTRIB)/Misc/aminet \ files=$(FILES) diff --git a/aminet/util/moni/memspeed/mmakefile.src b/aminet/util/moni/memspeed/mmakefile.src index 288d1a076..b3b72483f 100644 --- a/aminet/util/moni/memspeed/mmakefile.src +++ b/aminet/util/moni/memspeed/mmakefile.src @@ -1,5 +1,5 @@ include $(TOP)/config/make.cfg %build_prog mmake=aminet-util-moni-memspeed \ - progname=memspeed targetdir=$(CONTRIBDIR)/Misc/aminet \ + progname=memspeed targetdir=$(AROS_CONTRIB)/Misc/aminet \ files=memspeed diff --git a/aminet/util/moni/nbench/mmakefile.src b/aminet/util/moni/nbench/mmakefile.src index 8904f0fc9..b4828f542 100644 --- a/aminet/util/moni/nbench/mmakefile.src +++ b/aminet/util/moni/nbench/mmakefile.src @@ -6,7 +6,7 @@ include $(TOP)/config/make.cfg FILES :=emfloat misc nbench0 nbench1 sysspec -EXEDIR := $(CONTRIBDIR)/Misc/aminet +EXEDIR := $(AROS_CONTRIB)/Misc/aminet USER_CFLAGS := -s -static -Wall -O3 -fomit-frame-pointer -funroll-loops -DLINUX diff --git a/aminet/util/pack/ppunpack/mmakefile.src b/aminet/util/pack/ppunpack/mmakefile.src index 82fa95eb9..61bd20330 100644 --- a/aminet/util/pack/ppunpack/mmakefile.src +++ b/aminet/util/pack/ppunpack/mmakefile.src @@ -1,5 +1,5 @@ include $(TOP)/config/make.cfg %build_prog mmake=aminet-util-pack-ppunpack \ - progname=ppunpack targetdir=$(CONTRIBDIR)/Misc/aminet \ + progname=ppunpack targetdir=$(AROS_CONTRIB)/Misc/aminet \ files="depack ppunpack" diff --git a/aminet/util/pack/unhqx/mmakefile.src b/aminet/util/pack/unhqx/mmakefile.src index 2c5fc4f16..94f416c1a 100644 --- a/aminet/util/pack/unhqx/mmakefile.src +++ b/aminet/util/pack/unhqx/mmakefile.src @@ -1,5 +1,5 @@ include $(TOP)/config/make.cfg %build_prog mmake=aminet-util-pack-unhqx \ - progname=unhqx targetdir=$(CONTRIBDIR)/Misc/aminet \ + progname=unhqx targetdir=$(AROS_CONTRIB)/Misc/aminet \ files=unhqx diff --git a/aminet/util/pack/unsqsh/mmakefile.src b/aminet/util/pack/unsqsh/mmakefile.src index b353217d2..743772158 100644 --- a/aminet/util/pack/unsqsh/mmakefile.src +++ b/aminet/util/pack/unsqsh/mmakefile.src @@ -1,5 +1,5 @@ include $(TOP)/config/make.cfg %build_prog mmake=aminet-util-pack-unsqsh \ - progname=unsqsh targetdir=$(CONTRIBDIR)/Misc/aminet \ + progname=unsqsh targetdir=$(AROS_CONTRIB)/Misc/aminet \ files=unsqsh diff --git a/aminet/util/wb/modifyicon/mmakefile.src b/aminet/util/wb/modifyicon/mmakefile.src index ab2036c6c..df937ad8c 100644 --- a/aminet/util/wb/modifyicon/mmakefile.src +++ b/aminet/util/wb/modifyicon/mmakefile.src @@ -6,7 +6,7 @@ include $(TOP)/config/make.cfg FILES := modifyicon -EXEDIR := $(CONTRIBDIR)/Misc/aminet +EXEDIR := $(AROS_CONTRIB)/Misc/aminet #MM aminet-util-wb-modifyicon : includes linklibs diff --git a/bgui/gadgets/mmakefile.src b/bgui/gadgets/mmakefile.src index afb3253bd..0d812b8df 100644 --- a/bgui/gadgets/mmakefile.src +++ b/bgui/gadgets/mmakefile.src @@ -4,14 +4,13 @@ include $(SRCDIR)/$(CURDIR)/../make.cfg USER_CFLAGS := $(PARANOIA_CFLAGS) BINDIR = $(AROSDIR) -LIBDIR = $(AROS_LIB) OBJDIR = $(GENDIR)/$(CURDIR) COMMONINCLUDES := -I$(SRCDIR)/$(CURDIR)/include -I$(SRCDIR)/$(CURDIR)/../ LAYOUTGROUPINCLUDES := $(COMMONINCLUDES) -I$(SRCDIR)/$(CURDIR)/include -I$(SRCDIR)/$(CURDIR)/LayoutGroup TREEVIEWINCLUDES := $(COMMONINCLUDES) -I$(SRCDIR)/$(CURDIR)/TreeView/include -EXELIBS = -L$(LIBDIR) -lamiga -larossupport -lbgui -lautoinit -lstdc +EXELIBS = -L$(AROS_LIB) -lamiga -larossupport -lbgui -lautoinit -lstdc GADGETLIBS = -lbgui -lstdc -lamiga BARGADGET = bgui_bar.gadget diff --git a/bgui/make.cfg b/bgui/make.cfg index 320d2bef8..ca8d53e3f 100644 --- a/bgui/make.cfg +++ b/bgui/make.cfg @@ -1,4 +1,4 @@ -BGUIDIR := $(CONTRIBDIR)/BGUI +BGUIDIR := $(AROS_CONTRIB)/BGUI BGUILIBSDIR := $(BGUIDIR)/Libs BGUIEXAMPLESDIR := $(BGUIDIR)/Examples BGUITESTSDIR := $(BGUIDIR)/Tests diff --git a/bgui/mmakefile.src b/bgui/mmakefile.src index 7372e5823..5719e37a9 100644 --- a/bgui/mmakefile.src +++ b/bgui/mmakefile.src @@ -215,7 +215,7 @@ FILES := libtag \ %build_module_simple mmake=bgui-library \ modname=bgui modtype=library \ - moduledir=$(CONTRIBDIR)/BGUI/Libs \ + moduledir=$(AROS_CONTRIB)/BGUI/Libs \ files="$(FILES)" %common diff --git a/bgui/workbench/tools/mmakefile.src b/bgui/workbench/tools/mmakefile.src index 1580f405d..30e139fe4 100644 --- a/bgui/workbench/tools/mmakefile.src +++ b/bgui/workbench/tools/mmakefile.src @@ -7,7 +7,7 @@ USER_CFLAGS := $(PARANOIA_CFLAGS) FILES := \ calculator_bgui -EXEDIR := $(CONTRIBDIR)/BGUI/Examples +EXEDIR := $(AROS_CONTRIB)/BGUI/Examples #MM- contrib-bgui : contrib-bgui-workbench-tools #MM contrib-bgui-workbench-tools : includes linklibs contrib-bgui diff --git a/development/build/makedepend/mmakefile.src b/development/build/makedepend/mmakefile.src index d2af09b6d..31506537d 100644 --- a/development/build/makedepend/mmakefile.src +++ b/development/build/makedepend/mmakefile.src @@ -6,7 +6,7 @@ include $(TOP)/config/make.cfg FILES := include main parse pr cppsetup ifparser -EXEDIR := $(CONTRIBDIR)/Development/Build +EXEDIR := $(AROS_CONTRIB)/Development/Build USER_CFLAGS := -DAROS -DINCLUDEDIR=\"\" diff --git a/development/compilers/false/mmakefile.src b/development/compilers/false/mmakefile.src index f8f54db1a..fa60d5356 100644 --- a/development/compilers/false/mmakefile.src +++ b/development/compilers/false/mmakefile.src @@ -6,7 +6,7 @@ include $(TOP)/config/make.cfg FILES := false_int -EXEDIR := $(CONTRIBDIR)/Development/False +EXEDIR := $(AROS_CONTRIB)/Development/False #MM- contrib-development : contrib-development-false-$(CPU) diff --git a/development/compilers/lcc/cpp/mmakefile.src b/development/compilers/lcc/cpp/mmakefile.src index 628d40f33..dcb28b553 100644 --- a/development/compilers/lcc/cpp/mmakefile.src +++ b/development/compilers/lcc/cpp/mmakefile.src @@ -6,7 +6,7 @@ include $(TOP)/config/make.cfg FILES := cpp getopt include macro tokens eval hideset lex nlist unix -EXEDIR := $(CONTRIBDIR)/aminet/lcc +EXEDIR := $(AROS_CONTRIB)/aminet/lcc USER_CFLAGS := -DAROS -DV39 diff --git a/development/compilers/lcc/etc/mmakefile.src b/development/compilers/lcc/etc/mmakefile.src index b0524b5bf..53dfcee13 100644 --- a/development/compilers/lcc/etc/mmakefile.src +++ b/development/compilers/lcc/etc/mmakefile.src @@ -6,7 +6,7 @@ include $(TOP)/config/make.cfg FILES := lcc linux -EXEDIR := $(CONTRIBDIR)/aminet/lcc +EXEDIR := $(AROS_CONTRIB)/aminet/lcc USER_CFLAGS := -DAROS -DV39 diff --git a/development/compilers/lua/lsqlite3/mmakefile.src b/development/compilers/lua/lsqlite3/mmakefile.src index 21c7530c6..fcd5a34bb 100644 --- a/development/compilers/lua/lsqlite3/mmakefile.src +++ b/development/compilers/lua/lsqlite3/mmakefile.src @@ -5,7 +5,7 @@ include $(TOP)/config/make.cfg # files to build the linker lib 'lsqlite3' LSQLITE3LIBFILES := lsqlite3 -EXEDIR := $(CONTRIBDIR)/Development/Lua +EXEDIR := $(AROS_CONTRIB)/Development/Lua #MM- contrib-development : \ #MM contrib-development-lua-lsqlite3-doc \ diff --git a/development/compilers/lua/lua-xmlreader-0.1/mmakefile.src b/development/compilers/lua/lua-xmlreader-0.1/mmakefile.src index 21ed33c72..d5ac20c64 100644 --- a/development/compilers/lua/lua-xmlreader-0.1/mmakefile.src +++ b/development/compilers/lua/lua-xmlreader-0.1/mmakefile.src @@ -1,6 +1,6 @@ include $(TOP)/config/make.cfg -EXEDIR := $(CONTRIBDIR)/Development/Lua +EXEDIR := $(AROS_CONTRIB)/Development/Lua # files to build the linker lib 'luaxmlreader' XMLLIBFILES := error xmlreader diff --git a/development/compilers/lua/luafilesystem/mmakefile.src b/development/compilers/lua/luafilesystem/mmakefile.src index 2dc60a08d..d3ec1d912 100644 --- a/development/compilers/lua/luafilesystem/mmakefile.src +++ b/development/compilers/lua/luafilesystem/mmakefile.src @@ -2,7 +2,7 @@ include $(TOP)/config/make.cfg -EXEDIR := $(CONTRIBDIR)/Development/Lua +EXEDIR := $(AROS_CONTRIB)/Development/Lua #MM- contrib-development : \ #MM contrib-development-lua-lfs-doc \ diff --git a/development/compilers/lua/mmakefile.src b/development/compilers/lua/mmakefile.src index 093b89acf..0ef3740f0 100644 --- a/development/compilers/lua/mmakefile.src +++ b/development/compilers/lua/mmakefile.src @@ -2,7 +2,7 @@ include $(TOP)/config/make.cfg -EXEDIR := $(CONTRIBDIR)/Development/Lua +EXEDIR := $(AROS_CONTRIB)/Development/Lua #MM- contrib-development : contrib-development-lua \ #MM contrib-development-lua-lualibs \ diff --git a/development/compilers/lua/src/mmakefile.src b/development/compilers/lua/src/mmakefile.src index c4ec27c48..41017aafe 100644 --- a/development/compilers/lua/src/mmakefile.src +++ b/development/compilers/lua/src/mmakefile.src @@ -27,7 +27,7 @@ AMILUAFILES := amilua $(COREFILES) HEADERS := lua.h luaconf.h lualib.h lauxlib.h lsiamigalib.h lmuilib.h -EXEDIR := $(CONTRIBDIR)/Development/Lua +EXEDIR := $(AROS_CONTRIB)/Development/Lua USER_INCLUDES := -I$(SRCDIR)/$(CURDIR)/../luafilesystem/src -I$(SRCDIR)/$(CURDIR)/../lua-xmlreader-0.1 diff --git a/development/compilers/nasm/mmakefile.src b/development/compilers/nasm/mmakefile.src index 1f4736674..045fd2d75 100644 --- a/development/compilers/nasm/mmakefile.src +++ b/development/compilers/nasm/mmakefile.src @@ -9,7 +9,7 @@ FILES := nasm nasmlib float insnsa assemble labels \ outobj outas86 outrdf outrdf2 outdbg zoutieee \ preproc listing eval -EXEDIR := $(CONTRIBDIR)/Development/nasm +EXEDIR := $(AROS_CONTRIB)/Development/nasm #MM- contrib-development : contrib-development-nasm #MM contrib-development-nasm : contrib-development-nasm-setup \ diff --git a/development/compilers/tcc-0.9.19/mmakefile.src b/development/compilers/tcc-0.9.19/mmakefile.src index 0a5aa86e0..93c9423f7 100644 --- a/development/compilers/tcc-0.9.19/mmakefile.src +++ b/development/compilers/tcc-0.9.19/mmakefile.src @@ -2,7 +2,7 @@ include $(TOP)/config/make.cfg FILES := tcc -EXEDIR := $(CONTRIBDIR)/Development/TCC-0.9.19 +EXEDIR := $(AROS_CONTRIB)/Development/TCC-0.9.19 USER_CFLAGS := -Wall -DCONFIG_TCC_STATIC -DCONFIG_TCC_ALWAYS_RELOCATABLE USER_LDFLAGS := -ltcc1 @@ -14,10 +14,10 @@ USER_LDFLAGS := -ltcc1 files=$(FILES) #MM -setup-tcc-0.9.19 : $(LIBDIR)/bcheck.o $(EXEDIR)/stdarg.h +setup-tcc-0.9.19 : $(AROS_LIB)/bcheck.o $(EXEDIR)/stdarg.h -$(LIBDIR)/bcheck.o : bcheck.c - $(CC) -c bcheck.c -o $(LIBDIR)/bcheck.o +$(AROS_LIB)/bcheck.o : bcheck.c + $(CC) -c bcheck.c -o $(AROS_LIB)/bcheck.o $(EXEDIR)/stdarg.h : stdarg.h $(CP) ./stdarg.h $(EXEDIR) diff --git a/development/compilers/tcc/mmakefile.src b/development/compilers/tcc/mmakefile.src index d29bb3288..2a1ed1cd4 100644 --- a/development/compilers/tcc/mmakefile.src +++ b/development/compilers/tcc/mmakefile.src @@ -2,7 +2,7 @@ include $(TOP)/config/make.cfg FILES := tcc -EXEDIR := $(CONTRIBDIR)/Development/TCC +EXEDIR := $(AROS_CONTRIB)/Development/TCC USER_CFLAGS := -O2 -g -Wall -DCONFIG_TCC_STATIC -DAROSC USER_LDFLAGS := -ltcc1 diff --git a/development/compilers/vbcc/aros/mmakefile.src b/development/compilers/vbcc/aros/mmakefile.src index 8e1617f0c..6a6198ada 100644 --- a/development/compilers/vbcc/aros/mmakefile.src +++ b/development/compilers/vbcc/aros/mmakefile.src @@ -2,7 +2,7 @@ include $(TOP)/config/make.cfg FILES = about -EXEDIR := $(CONTRIBDIR)/vbcc +EXEDIR := $(AROS_CONTRIB)/vbcc #MM- contrib-development-compilers-vbcc-aros : \ #MM vbcc-about-aros vbcc-tmp diff --git a/development/compilers/vbcc/datatypes/mmakefile.src b/development/compilers/vbcc/datatypes/mmakefile.src index 0854b5bbe..7eb63ee55 100644 --- a/development/compilers/vbcc/datatypes/mmakefile.src +++ b/development/compilers/vbcc/datatypes/mmakefile.src @@ -2,7 +2,7 @@ include $(TOP)/config/make.cfg FILES = dtgen -EXEDIR := $(CONTRIBDIR)/vbcc +EXEDIR := $(AROS_CONTRIB)/vbcc #MM- contrib-development-compilers-vbcc-datatypes : \ #MM vbcc-dtgen vbcc-datatypes diff --git a/development/compilers/vbcc/frontend/mmakefile.src b/development/compilers/vbcc/frontend/mmakefile.src index 321fc5f36..1ee915803 100644 --- a/development/compilers/vbcc/frontend/mmakefile.src +++ b/development/compilers/vbcc/frontend/mmakefile.src @@ -2,7 +2,7 @@ include $(TOP)/config/make.cfg FILES = vc -EXEDIR := $(CONTRIBDIR)/vbcc +EXEDIR := $(AROS_CONTRIB)/vbcc #MM- contrib-development-compilers-vbcc-frontend : vbcc-frontend diff --git a/development/compilers/vbcc/mmakefile.src b/development/compilers/vbcc/mmakefile.src index 7bab43e0f..0f4615d8f 100644 --- a/development/compilers/vbcc/mmakefile.src +++ b/development/compilers/vbcc/mmakefile.src @@ -20,7 +20,7 @@ fobjects = $(TRGDIR)/opt $(TRGDIR)/av $(TRGDIR)/rd $(TRGDIR)/regs \ FILES = $(bobjects) $(fobjects) -EXEDIR := $(CONTRIBDIR)/vbcc +EXEDIR := $(AROS_CONTRIB)/vbcc USER_CFLAGS := -O2 -DAROS -D_QUAD_HIGHWORD=1 -D_QUAD_LOWWORD=0 -DNO_UCPP_ERROR_FUNCTIONS -I./ -I./machines/i386 #MM- contrib-development-compilers-vbcc : \ diff --git a/development/compilers/vbcc/vprof/mmakefile.src b/development/compilers/vbcc/vprof/mmakefile.src index 140ceaf34..3729eb2e8 100644 --- a/development/compilers/vbcc/vprof/mmakefile.src +++ b/development/compilers/vbcc/vprof/mmakefile.src @@ -2,7 +2,7 @@ include $(TOP)/config/make.cfg FILES = vprof -EXEDIR := $(CONTRIBDIR)/vbcc +EXEDIR := $(AROS_CONTRIB)/vbcc #MM- contrib-development-compilers-vbcc-vprof : vbcc-vprof diff --git a/development/mmakefile.src b/development/mmakefile.src index be5271230..9cf1ddbfe 100644 --- a/development/mmakefile.src +++ b/development/mmakefile.src @@ -10,6 +10,6 @@ contrib-development : setup #MM contrib-development-setup :: - %mkdirs_q $(CONTRIBDIR)/Development + %mkdirs_q $(AROS_CONTRIB)/Development %common diff --git a/dopus/make.cfg b/dopus/make.cfg index 8f92f1eae..48445ecaf 100644 --- a/dopus/make.cfg +++ b/dopus/make.cfg @@ -3,4 +3,4 @@ include $(TOP)/config/make.cfg -DOPUSDIR := $(CONTRIBDIR)/DOpus +DOPUSDIR := $(AROS_CONTRIB)/DOpus diff --git a/emu/e-uae/mmakefile.src b/emu/e-uae/mmakefile.src index a695dc6d7..08ae58192 100644 --- a/emu/e-uae/mmakefile.src +++ b/emu/e-uae/mmakefile.src @@ -2,7 +2,7 @@ include $(TOP)/config/make.cfg ##MM- contrib-complete : contrib-euae -PROGDIR := $(CONTRIBDIR)/Emu/E-UAE +PROGDIR := $(AROS_CONTRIB)/Emu/E-UAE PACKAGE := e-uae VERSION := 0.8.28 PKG_VER := $(PACKAGE)-$(VERSION) diff --git a/emu/mame/mmakefile.src b/emu/mame/mmakefile.src index 16668a626..2faf7d277 100644 --- a/emu/mame/mmakefile.src +++ b/emu/mame/mmakefile.src @@ -11,7 +11,7 @@ else AROSMAME_EXTRADEFS := endif -INSTDIR := $(CONTRIBDIR)/Emu/Mame +INSTDIR := $(AROS_CONTRIB)/Emu/Mame OBJDIR := $(GENDIR)/$(CURDIR) EXE := $(INSTDIR)/mame diff --git a/emu/uae/src/mmakefile.src b/emu/uae/src/mmakefile.src index d1e7d1fc4..dbe36c4ff 100644 --- a/emu/uae/src/mmakefile.src +++ b/emu/uae/src/mmakefile.src @@ -55,7 +55,7 @@ FILES := \ zfile \ td-thread -EXEDIR := $(CONTRIBDIR)/Emu/UAE +EXEDIR := $(AROS_CONTRIB)/Emu/UAE USER_CFLAGS := -O2 -fomit-frame-pointer -Wall -Wno-unused\ -Wno-format -W -Wmissing-prototypes -Wno-sign-compare \ diff --git a/fish/304_clines/mmakefile.src b/fish/304_clines/mmakefile.src index e902efd9e..d0f2d8e3a 100644 --- a/fish/304_clines/mmakefile.src +++ b/fish/304_clines/mmakefile.src @@ -1,6 +1,6 @@ include $(TOP)/config/make.cfg %build_prog mmake=fish-304_clines \ - progname=304_clines targetdir=$(CONTRIBDIR)/Misc/fish \ + progname=304_clines targetdir=$(AROS_CONTRIB)/Misc/fish \ files=clines diff --git a/fish/304_lines/mmakefile.src b/fish/304_lines/mmakefile.src index ab9dee003..dc6a943ad 100644 --- a/fish/304_lines/mmakefile.src +++ b/fish/304_lines/mmakefile.src @@ -1,5 +1,5 @@ include $(TOP)/config/make.cfg %build_prog mmake=fish-304_lines \ - progname=304_lines targetdir=$(CONTRIBDIR)/Misc/fish \ + progname=304_lines targetdir=$(AROS_CONTRIB)/Misc/fish \ files=lines diff --git a/fish/362_rubik/mmakefile.src b/fish/362_rubik/mmakefile.src index 35fbf1523..9af440a6a 100644 --- a/fish/362_rubik/mmakefile.src +++ b/fish/362_rubik/mmakefile.src @@ -4,5 +4,5 @@ FILES := rubik getwindow makecube rotate trig gadgets draw extras solve \ blurb %build_prog mmake=fish-362_rubik \ - progname=362_rubik targetdir=$(CONTRIBDIR)/Misc/fish \ + progname=362_rubik targetdir=$(AROS_CONTRIB)/Misc/fish \ files=$(FILES) diff --git a/fish/371_fractal/mmakefile.src b/fish/371_fractal/mmakefile.src index 9f1411fad..e260488ea 100644 --- a/fish/371_fractal/mmakefile.src +++ b/fish/371_fractal/mmakefile.src @@ -1,5 +1,5 @@ include $(TOP)/config/make.cfg %build_prog mmake=fish-371_fractal \ - progname=371_fractal targetdir=$(CONTRIBDIR)/Misc/fish \ + progname=371_fractal targetdir=$(AROS_CONTRIB)/Misc/fish \ files="frac menu formulas formulas1 wilbm colorwindow" diff --git a/fish/aroach/mmakefile.src b/fish/aroach/mmakefile.src index f4d8a063e..a4941a92a 100644 --- a/fish/aroach/mmakefile.src +++ b/fish/aroach/mmakefile.src @@ -1,5 +1,5 @@ include $(TOP)/config/make.cfg %build_prog mmake=fish-aroach \ - progname=aroach targetdir=$(CONTRIBDIR)/Misc/fish \ + progname=aroach targetdir=$(AROS_CONTRIB)/Misc/fish \ files="animtools ARoach RoachData" diff --git a/fish/asimplex/mmakefile.src b/fish/asimplex/mmakefile.src index b185d229b..50c22d6a9 100644 --- a/fish/asimplex/mmakefile.src +++ b/fish/asimplex/mmakefile.src @@ -1,5 +1,5 @@ include $(TOP)/config/make.cfg %build_prog mmake=fish-asimplex \ - progname=asimplex targetdir=$(CONTRIBDIR)/Misc/fish \ + progname=asimplex targetdir=$(AROS_CONTRIB)/Misc/fish \ files="main matrix phase1 phase2 mpsx" diff --git a/fish/bezier/bouncing/mmakefile.src b/fish/bezier/bouncing/mmakefile.src index 88c9df629..5df8473ba 100644 --- a/fish/bezier/bouncing/mmakefile.src +++ b/fish/bezier/bouncing/mmakefile.src @@ -3,5 +3,5 @@ include $(TOP)/config/make.cfg CFLAGS := $(filter-out -Werror-implicit-function-declaration,$(CFLAGS)) %build_prog mmake=fish-bezier2 \ - progname=bezier2 targetdir=$(CONTRIBDIR)/Misc/fish \ + progname=bezier2 targetdir=$(AROS_CONTRIB)/Misc/fish \ files=bezier diff --git a/fish/bezier/cubic/mmakefile.src b/fish/bezier/cubic/mmakefile.src index 9673c60f4..b54a91daa 100644 --- a/fish/bezier/cubic/mmakefile.src +++ b/fish/bezier/cubic/mmakefile.src @@ -3,6 +3,6 @@ include $(TOP)/config/make.cfg CFLAGS := $(filter-out -Werror-implicit-function-declaration,$(CFLAGS)) %build_prog mmake=fish-bcubic \ - progname=bcubic targetdir=$(CONTRIBDIR)/Misc/fish \ + progname=bcubic targetdir=$(AROS_CONTRIB)/Misc/fish \ files=bcubic diff --git a/fish/bezier/orig/mmakefile.src b/fish/bezier/orig/mmakefile.src index f8207f168..42034277e 100644 --- a/fish/bezier/orig/mmakefile.src +++ b/fish/bezier/orig/mmakefile.src @@ -3,6 +3,6 @@ include $(TOP)/config/make.cfg CFLAGS := $(filter-out -Werror-implicit-function-declaration,$(CFLAGS)) %build_prog mmake=fish-bezier1 \ - progname=bezier1 targetdir=$(CONTRIBDIR)/Misc/fish \ + progname=bezier1 targetdir=$(AROS_CONTRIB)/Misc/fish \ files=bezier diff --git a/fish/cfn/mmakefile.src b/fish/cfn/mmakefile.src index 3d021df68..29185a5a4 100644 --- a/fish/cfn/mmakefile.src +++ b/fish/cfn/mmakefile.src @@ -3,9 +3,9 @@ include $(TOP)/config/make.cfg #MM fish-cfn : fish-cfn_newshell %build_prog mmake=fish-cfn \ - progname=cfn targetdir=$(CONTRIBDIR)/Misc/fish \ + progname=cfn targetdir=$(AROS_CONTRIB)/Misc/fish \ files=cfn %build_prog mmake=fish-cfn_newshell \ - progname=cfn_newshell targetdir=$(CONTRIBDIR)/Misc/fish \ + progname=cfn_newshell targetdir=$(AROS_CONTRIB)/Misc/fish \ files=cfn_newshell diff --git a/fish/cube/mmakefile.src b/fish/cube/mmakefile.src index 928698875..19e838351 100644 --- a/fish/cube/mmakefile.src +++ b/fish/cube/mmakefile.src @@ -1,5 +1,5 @@ include $(TOP)/config/make.cfg %build_prog mmake=fish-cube \ - progname=cube targetdir=$(CONTRIBDIR)/Misc/fish \ + progname=cube targetdir=$(AROS_CONTRIB)/Misc/fish \ files=cube diff --git a/fish/egypt/mmakefile.src b/fish/egypt/mmakefile.src index e89f01602..53c49e854 100644 --- a/fish/egypt/mmakefile.src +++ b/fish/egypt/mmakefile.src @@ -1,5 +1,5 @@ include $(TOP)/config/make.cfg %build_prog mmake=fish-egypt \ - progname=egypt targetdir=$(CONTRIBDIR)/Misc/fish \ + progname=egypt targetdir=$(AROS_CONTRIB)/Misc/fish \ files=egypt diff --git a/fish/eval/mmakefile.src b/fish/eval/mmakefile.src index 6cc32078c..f407fb5c4 100644 --- a/fish/eval/mmakefile.src +++ b/fish/eval/mmakefile.src @@ -1,5 +1,5 @@ include $(TOP)/config/make.cfg %build_prog mmake=fish-eval \ - progname=eval targetdir=$(CONTRIBDIR)/Misc/fish \ + progname=eval targetdir=$(AROS_CONTRIB)/Misc/fish \ files="base bitwise emath estack etable eval funcs help parse" diff --git a/fish/find/mmakefile.src b/fish/find/mmakefile.src index e1626becb..46dec246a 100644 --- a/fish/find/mmakefile.src +++ b/fish/find/mmakefile.src @@ -4,5 +4,5 @@ FILES := find find_broker find_error find_file find_main find_match find_rx \ find_temp %build_prog mmake=fish-find \ - progname=find targetdir=$(CONTRIBDIR)/Misc/fish \ + progname=find targetdir=$(AROS_CONTRIB)/Misc/fish \ files=$(FILES) \ No newline at end of file diff --git a/fish/fiveinline/mmakefile.src b/fish/fiveinline/mmakefile.src index be9538224..c2ead3d14 100644 --- a/fish/fiveinline/mmakefile.src +++ b/fish/fiveinline/mmakefile.src @@ -1,5 +1,5 @@ include $(TOP)/config/make.cfg %build_prog mmake=fish-fiveinline \ - progname=fiveinline targetdir=$(CONTRIBDIR)/Misc/fish \ + progname=fiveinline targetdir=$(AROS_CONTRIB)/Misc/fish \ files=fiveinline diff --git a/fish/gooddouble/mmakefile.src b/fish/gooddouble/mmakefile.src index db5e9f9d7..22d53560e 100644 --- a/fish/gooddouble/mmakefile.src +++ b/fish/gooddouble/mmakefile.src @@ -1,6 +1,6 @@ include $(TOP)/config/make.cfg %build_prog mmake=fish-gooddouble \ - progname=GoodDouble targetdir=$(CONTRIBDIR)/Misc/fish \ + progname=GoodDouble targetdir=$(AROS_CONTRIB)/Misc/fish \ files="ClickTest GoodDouble GoodDouble2" diff --git a/fish/grep/mmakefile.src b/fish/grep/mmakefile.src index 901e19b2e..6aa2c8439 100644 --- a/fish/grep/mmakefile.src +++ b/fish/grep/mmakefile.src @@ -1,5 +1,5 @@ include $(TOP)/config/make.cfg %build_prog mmake=fish-grep \ - progname=grep targetdir=$(CONTRIBDIR)/Misc/fish \ + progname=grep targetdir=$(AROS_CONTRIB)/Misc/fish \ files=grep diff --git a/fish/henon/mmakefile.src b/fish/henon/mmakefile.src index 27cc44944..70be36922 100644 --- a/fish/henon/mmakefile.src +++ b/fish/henon/mmakefile.src @@ -1,5 +1,5 @@ include $(TOP)/config/make.cfg %build_prog mmake=fish-henon \ - progname=henon targetdir=$(CONTRIBDIR)/Misc/fish \ + progname=henon targetdir=$(AROS_CONTRIB)/Misc/fish \ files=henon diff --git a/fish/icalc/mmakefile.src b/fish/icalc/mmakefile.src index 0c161e276..0dc2d134e 100644 --- a/fish/icalc/mmakefile.src +++ b/fish/icalc/mmakefile.src @@ -11,5 +11,5 @@ FILES := cmath \ tree %build_prog mmake=fish-icalc \ - progname=icalc targetdir=$(CONTRIBDIR)/Misc/fish \ + progname=icalc targetdir=$(AROS_CONTRIB)/Misc/fish \ files=$(FILES) diff --git a/fish/icon2c/mmakefile.src b/fish/icon2c/mmakefile.src index 5e131b989..3560eb6f6 100644 --- a/fish/icon2c/mmakefile.src +++ b/fish/icon2c/mmakefile.src @@ -1,5 +1,5 @@ include $(TOP)/config/make.cfg %build_prog mmake=fish-icon2c \ - progname=icon2c targetdir=$(CONTRIBDIR)/Misc/fish \ + progname=icon2c targetdir=$(AROS_CONTRIB)/Misc/fish \ files=icon2c diff --git a/fish/input/mmakefile.src b/fish/input/mmakefile.src index 32561b145..d39e3da75 100644 --- a/fish/input/mmakefile.src +++ b/fish/input/mmakefile.src @@ -1,5 +1,5 @@ include $(TOP)/config/make.cfg %build_prog mmake=fish-input \ - progname=input_test targetdir=$(CONTRIBDIR)/Misc/fish \ + progname=input_test targetdir=$(AROS_CONTRIB)/Misc/fish \ files="console input test" diff --git a/fish/layers/mmakefile.src b/fish/layers/mmakefile.src index 6de786ad1..609c6794a 100644 --- a/fish/layers/mmakefile.src +++ b/fish/layers/mmakefile.src @@ -1,5 +1,5 @@ include $(TOP)/config/make.cfg %build_prog mmake=fish-layers \ - progname=layers targetdir=$(CONTRIBDIR)/Misc/fish \ + progname=layers targetdir=$(AROS_CONTRIB)/Misc/fish \ files=layers diff --git a/fish/lines/mmakefile.src b/fish/lines/mmakefile.src index b5c9b6fc8..3f6b71080 100644 --- a/fish/lines/mmakefile.src +++ b/fish/lines/mmakefile.src @@ -1,5 +1,5 @@ include $(TOP)/config/make.cfg %build_prog mmake=fish-lines \ - progname=lines targetdir=$(CONTRIBDIR)/Misc/fish \ + progname=lines targetdir=$(AROS_CONTRIB)/Misc/fish \ files=lines diff --git a/fish/lotto/mmakefile.src b/fish/lotto/mmakefile.src index 6922b8dba..2d929d198 100644 --- a/fish/lotto/mmakefile.src +++ b/fish/lotto/mmakefile.src @@ -1,5 +1,5 @@ include $(TOP)/config/make.cfg %build_prog mmake=fish-lotto \ - progname=lotto targetdir=$(CONTRIBDIR)/Misc/fish \ + progname=lotto targetdir=$(AROS_CONTRIB)/Misc/fish \ files=lotto diff --git a/fish/lyr-o-mat/mmakefile.src b/fish/lyr-o-mat/mmakefile.src index 018c07d50..f95db51b6 100644 --- a/fish/lyr-o-mat/mmakefile.src +++ b/fish/lyr-o-mat/mmakefile.src @@ -3,5 +3,5 @@ include $(TOP)/config/make.cfg FILES := words words_file words_list words_main words_replace words_temp %build_prog mmake=fish-lyromat \ - progname=lyr-o-mat targetdir=$(CONTRIBDIR)/Misc/fish \ + progname=lyr-o-mat targetdir=$(AROS_CONTRIB)/Misc/fish \ files=$(FILES) diff --git a/fish/mandel/mmakefile.src b/fish/mandel/mmakefile.src index 102050c41..1a2123b51 100644 --- a/fish/mandel/mmakefile.src +++ b/fish/mandel/mmakefile.src @@ -3,5 +3,5 @@ include $(TOP)/config/make.cfg CFLAGS := $(filter-out -Werror-implicit-function-declaration,$(CFLAGS)) %build_prog mmake=fish-mandel \ - progname=mand targetdir=$(CONTRIBDIR)/Misc/fish \ + progname=mand targetdir=$(AROS_CONTRIB)/Misc/fish \ files="mand mand1 mand2 mand3 mand4" diff --git a/fish/memeter/mmakefile.src b/fish/memeter/mmakefile.src index 4bfa90dff..d4f423fa6 100644 --- a/fish/memeter/mmakefile.src +++ b/fish/memeter/mmakefile.src @@ -1,5 +1,5 @@ include $(TOP)/config/make.cfg %build_prog mmake=fish-memeter \ - progname=memeter targetdir=$(CONTRIBDIR)/Misc/fish \ + progname=memeter targetdir=$(AROS_CONTRIB)/Misc/fish \ files=memeter diff --git a/fish/memomaster/mmakefile.src b/fish/memomaster/mmakefile.src index 3d02f442b..333b06486 100644 --- a/fish/memomaster/mmakefile.src +++ b/fish/memomaster/mmakefile.src @@ -1,5 +1,5 @@ include $(TOP)/config/make.cfg %build_prog mmake=fish-memomaster \ - progname=mm2 targetdir=$(CONTRIBDIR)/Misc/fish \ + progname=mm2 targetdir=$(AROS_CONTRIB)/Misc/fish \ files="datefunc deledadd display helpmode listfunc mm2" diff --git a/fish/memsnap/mmakefile.src b/fish/memsnap/mmakefile.src index 8544f0ddd..50896eb69 100644 --- a/fish/memsnap/mmakefile.src +++ b/fish/memsnap/mmakefile.src @@ -1,5 +1,5 @@ include $(TOP)/config/make.cfg %build_prog mmake=fish-memsnap \ - progname=memsnap targetdir=$(CONTRIBDIR)/Misc/fish \ + progname=memsnap targetdir=$(AROS_CONTRIB)/Misc/fish \ files="icon memsnap menu wintext" diff --git a/fish/microemacs/mmakefile.src b/fish/microemacs/mmakefile.src index a14d1f071..ed94971a3 100644 --- a/fish/microemacs/mmakefile.src +++ b/fish/microemacs/mmakefile.src @@ -21,5 +21,5 @@ FILES := ansi \ CFLAGS := $(filter-out -Werror-implicit-function-declaration,$(CFLAGS)) %build_prog mmake=fish-microemacs \ - progname=microemacs targetdir=$(CONTRIBDIR)/Misc/fish \ + progname=microemacs targetdir=$(AROS_CONTRIB)/Misc/fish \ files=$(FILES) diff --git a/fish/mosaic/mmakefile.src b/fish/mosaic/mmakefile.src index 512669319..134af916a 100644 --- a/fish/mosaic/mmakefile.src +++ b/fish/mosaic/mmakefile.src @@ -1,5 +1,5 @@ include $(TOP)/config/make.cfg %build_prog mmake=fish-mosaic \ - progname=mosaic targetdir=$(CONTRIBDIR)/Misc/fish \ + progname=mosaic targetdir=$(AROS_CONTRIB)/Misc/fish \ files=mosaic diff --git a/fish/rubik/mmakefile.src b/fish/rubik/mmakefile.src index 604d25e43..c7271c095 100644 --- a/fish/rubik/mmakefile.src +++ b/fish/rubik/mmakefile.src @@ -3,5 +3,5 @@ include $(TOP)/config/make.cfg CFLAGS := $(filter-out -Werror-implicit-function-declaration,$(CFLAGS)) %build_prog mmake=fish-rubik \ - progname=rubik targetdir=$(CONTRIBDIR)/Misc/fish \ + progname=rubik targetdir=$(AROS_CONTRIB)/Misc/fish \ files="rubik1 rubik2" diff --git a/fish/screenzap/mmakefile.src b/fish/screenzap/mmakefile.src index a2d173f4a..648c3613a 100644 --- a/fish/screenzap/mmakefile.src +++ b/fish/screenzap/mmakefile.src @@ -1,5 +1,5 @@ include $(TOP)/config/make.cfg %build_prog mmake=fish-screenzap \ - progname=screenzap targetdir=$(CONTRIBDIR)/Misc/fish \ + progname=screenzap targetdir=$(AROS_CONTRIB)/Misc/fish \ files=screenzap diff --git a/fish/shuffle/mmakefile.src b/fish/shuffle/mmakefile.src index 41d5eccce..dd9acc28f 100644 --- a/fish/shuffle/mmakefile.src +++ b/fish/shuffle/mmakefile.src @@ -1,5 +1,5 @@ include $(TOP)/config/make.cfg %build_prog mmake=fish-shuffle \ - progname=shuffle targetdir=$(CONTRIBDIR)/Misc/fish \ + progname=shuffle targetdir=$(AROS_CONTRIB)/Misc/fish \ files="shuffle shuffle_files shuffle_main shuffle_temp" diff --git a/fish/snowfall/mmakefile.src b/fish/snowfall/mmakefile.src index 0a32a01c3..3034e49d2 100644 --- a/fish/snowfall/mmakefile.src +++ b/fish/snowfall/mmakefile.src @@ -1,5 +1,5 @@ include $(TOP)/config/make.cfg %build_prog mmake=fish-snowfall \ - progname=snowfall targetdir=$(CONTRIBDIR)/Misc/fish \ + progname=snowfall targetdir=$(AROS_CONTRIB)/Misc/fish \ files=snowfall diff --git a/fish/sunmaze/mmakefile.src b/fish/sunmaze/mmakefile.src index 93def2e67..11521f609 100644 --- a/fish/sunmaze/mmakefile.src +++ b/fish/sunmaze/mmakefile.src @@ -1,5 +1,5 @@ include $(TOP)/config/make.cfg %build_prog mmake=fish-sunmaze \ - progname=sunmaze targetdir=$(CONTRIBDIR)/Misc/fish \ + progname=sunmaze targetdir=$(AROS_CONTRIB)/Misc/fish \ files=sunmaze diff --git a/fish/surf/mmakefile.src b/fish/surf/mmakefile.src index 37f8face9..eeb672e14 100644 --- a/fish/surf/mmakefile.src +++ b/fish/surf/mmakefile.src @@ -5,5 +5,5 @@ FILES := bezpt control fasttrig gadgetdef gadgetuse getfilenames \ readilbm revolve scrndef scrnio scrnops writeilbm %build_prog mmake=fish-surf \ - progname=surf targetdir=$(CONTRIBDIR)/Misc/fish \ + progname=surf targetdir=$(AROS_CONTRIB)/Misc/fish \ files=$(FILES) diff --git a/fish/touch/mmakefile.src b/fish/touch/mmakefile.src index d194bb8f3..98b696e0d 100644 --- a/fish/touch/mmakefile.src +++ b/fish/touch/mmakefile.src @@ -1,5 +1,5 @@ include $(TOP)/config/make.cfg %build_prog mmake=fish-touch \ - progname=touch targetdir=$(CONTRIBDIR)/Misc/fish \ + progname=touch targetdir=$(AROS_CONTRIB)/Misc/fish \ files=touch diff --git a/fish/tree/mmakefile.src b/fish/tree/mmakefile.src index e7f2eb369..51cb7cea6 100644 --- a/fish/tree/mmakefile.src +++ b/fish/tree/mmakefile.src @@ -1,5 +1,5 @@ include $(TOP)/config/make.cfg %build_prog mmake=fish-tree \ - progname=tree targetdir=$(CONTRIBDIR)/Misc/fish \ + progname=tree targetdir=$(AROS_CONTRIB)/Misc/fish \ files=tree diff --git a/fish/watchman/mmakefile.src b/fish/watchman/mmakefile.src index 824b87554..d98cc0cb6 100644 --- a/fish/watchman/mmakefile.src +++ b/fish/watchman/mmakefile.src @@ -1,5 +1,5 @@ include $(TOP)/config/make.cfg %build_prog mmake=fish-watchman \ - progname=watchman targetdir=$(CONTRIBDIR)/Misc/fish \ + progname=watchman targetdir=$(AROS_CONTRIB)/Misc/fish \ files=watchman diff --git a/fish/windowtool/mmakefile.src b/fish/windowtool/mmakefile.src index 2e8480e36..7d58d408e 100644 --- a/fish/windowtool/mmakefile.src +++ b/fish/windowtool/mmakefile.src @@ -6,7 +6,7 @@ include $(TOP)/config/make.cfg FILES := checkstartup functions gadgets windowtool -EXEDIR := $(CONTRIBDIR)/Misc/fish +EXEDIR := $(AROS_CONTRIB)/Misc/fish #MM fish-windowtool : includes linklibs diff --git a/fish/worldtime/mmakefile.src b/fish/worldtime/mmakefile.src index e9b207d53..3e34f3533 100644 --- a/fish/worldtime/mmakefile.src +++ b/fish/worldtime/mmakefile.src @@ -3,9 +3,9 @@ include $(TOP)/config/make.cfg #MM fish-worldtime : fish-worldtime-files %build_prog mmake=fish-worldtime \ - progname=WorldTime targetdir=$(CONTRIBDIR)/Misc/fish/WorldTime \ + progname=WorldTime targetdir=$(AROS_CONTRIB)/Misc/fish/WorldTime \ files=main FILES := worldtime.cfg worldtime.dat -%copy_files_q mmake=fish-worldtime-files files=$(FILES) dst=$(CONTRIBDIR)/Misc/fish/WorldTime +%copy_files_q mmake=fish-worldtime-files files=$(FILES) dst=$(AROS_CONTRIB)/Misc/fish/WorldTime diff --git a/fish/yachtc/mmakefile.src b/fish/yachtc/mmakefile.src index 62c0a802e..ce556f0c7 100644 --- a/fish/yachtc/mmakefile.src +++ b/fish/yachtc/mmakefile.src @@ -1,5 +1,5 @@ include $(TOP)/config/make.cfg %build_prog mmake=fish-yachtc \ - progname=yachtc targetdir=$(CONTRIBDIR)/Misc/fish \ + progname=yachtc targetdir=$(AROS_CONTRIB)/Misc/fish \ files=yachtc diff --git a/gc/mmakefile.src b/gc/mmakefile.src index 6b980a4d3..97ae81cf0 100644 --- a/gc/mmakefile.src +++ b/gc/mmakefile.src @@ -9,7 +9,7 @@ include $(TOP)/config/make.cfg FILES := alloc reclaim allchblk misc mach_dep os_dep mark_rts headers mark obj_map blacklst finalize new_hblk real_malloc dyn_load dbg_mlc malloc stubborn checksums typd_mlc ptr_chck mallocx tests/test -EXEDIR := $(CONTRIBDIR)/gc +EXEDIR := $(AROS_CONTRIB)/gc USER_CFLAGS := -O2 -Wunused -Wall -Uunix -Ulinux -U__linux__ -DATOMIC_UNCOLLECTABLE -DSILENT -Iinclude diff --git a/gfx/XaoS/icons/mmakefile.src b/gfx/XaoS/icons/mmakefile.src index ec5cb1a1a..b2581b4b0 100644 --- a/gfx/XaoS/icons/mmakefile.src +++ b/gfx/XaoS/icons/mmakefile.src @@ -1,6 +1,6 @@ include $(TOP)/config/make.cfg -DESTDIR := $(CONTRIBDIR)/MultiMedia/Gfx/XaoS +DESTDIR := $(AROS_CONTRIB)/MultiMedia/Gfx/XaoS %build_icons mmake=gfx-xaos-icons icons=XaoS dir=$(DESTDIR) diff --git a/gfx/XaoS/mmakefile.src b/gfx/XaoS/mmakefile.src index 995b8a049..9eddc2368 100644 --- a/gfx/XaoS/mmakefile.src +++ b/gfx/XaoS/mmakefile.src @@ -1,7 +1,7 @@ include $(TOP)/config/make.cfg OBJDIR := $(GENDIR)/$(CURDIR) -DESTDIR := $(CONTRIBDIR)/MultiMedia/Gfx/XaoS +DESTDIR := $(AROS_CONTRIB)/MultiMedia/Gfx/XaoS DATADIR := $(DESTDIR)/data CATALOGDIR := $(DATADIR)/catalogs EXAMPLEDIR := $(DATADIR)/examples diff --git a/gfx/XaoS/src/mmakefile.src b/gfx/XaoS/src/mmakefile.src index 19c114cba..a4a45356e 100644 --- a/gfx/XaoS/src/mmakefile.src +++ b/gfx/XaoS/src/mmakefile.src @@ -1,6 +1,6 @@ include $(TOP)/config/make.cfg -PROG := $(CONTRIBDIR)/MultiMedia/Gfx/XaoS/XaoS +PROG := $(AROS_CONTRIB)/MultiMedia/Gfx/XaoS/XaoS #MM gfx-xaos-prog : setup-gfx-xaos linklibs-xaosengine \ #MM linklibs-xaosfilter \ @@ -17,9 +17,9 @@ gfx-xaos-prog : $(PROG) gfx-xaos-prog-quick : $(PROG) XAOSLIBS := ui engine util filter uiaros -XAOSLIBFILES := $(foreach f, $(XAOSLIBS), $(LIBDIR)/libxaos$(f).a) +XAOSLIBFILES := $(foreach f, $(XAOSLIBS), $(AROS_LIB)/libxaos$(f).a) %rule_link_prog prog=$(PROG) objs=$(XAOSLIBFILES) #MM setup-gfx-xaos -%rule_makedirs dirs=$(CONTRIBDIR)/MultiMedia/Gfx/XaoS setuptarget=setup-gfx-xaos +%rule_makedirs dirs=$(AROS_CONTRIB)/MultiMedia/Gfx/XaoS setuptarget=setup-gfx-xaos diff --git a/gfx/mysticube/mmakefile.src b/gfx/mysticube/mmakefile.src index 2a9060c6d..529b7e827 100644 --- a/gfx/mysticube/mmakefile.src +++ b/gfx/mysticube/mmakefile.src @@ -7,7 +7,7 @@ include $(TOP)/config/make.cfg FILES := mysticube logo -EXEDIR := $(CONTRIBDIR)/MultiMedia/Gfx/MystiCube +EXEDIR := $(AROS_CONTRIB)/MultiMedia/Gfx/MystiCube USER_CFLAGS := -D__far diff --git a/gfx/mysticview/src/mmakefile.src b/gfx/mysticview/src/mmakefile.src index 7e307bc13..40cb8a09c 100644 --- a/gfx/mysticview/src/mmakefile.src +++ b/gfx/mysticview/src/mmakefile.src @@ -30,7 +30,7 @@ FILES := MysticView \ Mystic_Tools \ Mystic_Window -EXEDIR := $(CONTRIBDIR)/MultiMedia/Gfx/MysticView +EXEDIR := $(AROS_CONTRIB)/MultiMedia/Gfx/MysticView #MM- contrib-gfx : contrib-gfx-mysticview #MM contrib-gfx-mysticview : includes linklibs contrib-gfx-libs-mysticview diff --git a/gfx/povray/mmakefile.src b/gfx/povray/mmakefile.src index e87395899..4979c39e5 100644 --- a/gfx/povray/mmakefile.src +++ b/gfx/povray/mmakefile.src @@ -1,6 +1,6 @@ include $(TOP)/config/make.cfg -EXEDIR := $(CONTRIBDIR)/MultiMedia/Gfx/POVRay +EXEDIR := $(AROS_CONTRIB)/MultiMedia/Gfx/POVRay FILES = aros \ atmosph \ diff --git a/gnu/make.cfg b/gnu/make.cfg index 53691151e..be3d22482 100644 --- a/gnu/make.cfg +++ b/gnu/make.cfg @@ -1,3 +1,3 @@ include $(TOP)/config/make.cfg -GNUDIR := $(CONTRIBDIR)/GNU +GNUDIR := $(AROS_CONTRIB)/GNU diff --git a/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/DOpus/mmakefile.src b/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/DOpus/mmakefile.src index 39520b8f5..7a5d47f19 100644 --- a/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/DOpus/mmakefile.src +++ b/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/DOpus/mmakefile.src @@ -8,4 +8,4 @@ include $(TOP)/config/make.cfg ICONS := DirectoryOpus ConfigOpus #MM- iconset-Gorilla-contrib-icons-extras-clean : iconset-Gorilla-contrib-icons-extras-dopus-clean -%build_icons mmake=iconset-Gorilla-contrib-icons-extras-dopus icons=$(ICONS) dir=$(CONTRIBDIR)/DOpus +%build_icons mmake=iconset-Gorilla-contrib-icons-extras-dopus icons=$(ICONS) dir=$(AROS_CONTRIB)/DOpus diff --git a/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/Demos/mmakefile.src b/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/Demos/mmakefile.src index 7cd5400f6..bca9b15a5 100644 --- a/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/Demos/mmakefile.src +++ b/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/Demos/mmakefile.src @@ -27,4 +27,4 @@ ICONS := BlackHole \ StartMesaDemos #MM- iconset-Gorilla-contrib-icons-extras-clean : iconset-Gorilla-contrib-icons-extras-demos-clean -%build_icons mmake=iconset-Gorilla-contrib-icons-extras-demos icons=$(ICONS) dir=$(CONTRIBDIR)/Demos +%build_icons mmake=iconset-Gorilla-contrib-icons-extras-demos icons=$(ICONS) dir=$(AROS_CONTRIB)/Demos diff --git a/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/Development/Lua/mmakefile.src b/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/Development/Lua/mmakefile.src index 40ea12e40..3bd4c7f8d 100644 --- a/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/Development/Lua/mmakefile.src +++ b/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/Development/Lua/mmakefile.src @@ -8,4 +8,4 @@ include $(TOP)/config/make.cfg ICONS := AmiLua #MM- iconset-Gorilla-contrib-icons-extras-development-clean : iconset-Gorilla-contrib-icons-extras-development-lua-clean -%build_icons mmake=iconset-Gorilla-contrib-icons-extras-development-lua icons=$(ICONS) dir=$(CONTRIBDIR)/Development/Lua +%build_icons mmake=iconset-Gorilla-contrib-icons-extras-development-lua icons=$(ICONS) dir=$(AROS_CONTRIB)/Development/Lua diff --git a/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/Development/mmakefile.src b/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/Development/mmakefile.src index 43450e5d1..037f9bf39 100644 --- a/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/Development/mmakefile.src +++ b/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/Development/mmakefile.src @@ -8,4 +8,4 @@ include $(TOP)/config/make.cfg ICONS := Build False Lua nasm MUIBuilder ChocolateCastle #MM- iconset-Gorilla-contrib-icons-extras-clean : iconset-Gorilla-contrib-icons-extras-development-clean -%build_icons mmake=iconset-Gorilla-contrib-icons-extras-development icons=$(ICONS) dir=$(CONTRIBDIR)/Development +%build_icons mmake=iconset-Gorilla-contrib-icons-extras-development icons=$(ICONS) dir=$(AROS_CONTRIB)/Development diff --git a/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/Emu/E-UAE/mmakefile.src b/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/Emu/E-UAE/mmakefile.src index a7660ed93..7d2726a1f 100644 --- a/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/Emu/E-UAE/mmakefile.src +++ b/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/Emu/E-UAE/mmakefile.src @@ -8,4 +8,4 @@ include $(TOP)/config/make.cfg ICONS := i386-aros-uae #MM- iconset-Gorilla-contrib-icons-extras-clean : iconset-Gorilla-contrib-icons-extras-emu-euae-clean -%build_icons mmake=iconset-Gorilla-contrib-icons-extras-emu-euae icons=$(ICONS) dir=$(CONTRIBDIR)/Emu/E-UAE +%build_icons mmake=iconset-Gorilla-contrib-icons-extras-emu-euae icons=$(ICONS) dir=$(AROS_CONTRIB)/Emu/E-UAE diff --git a/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/Emu/UAE/mmakefile.src b/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/Emu/UAE/mmakefile.src index 36b4b450c..49678b1bd 100644 --- a/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/Emu/UAE/mmakefile.src +++ b/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/Emu/UAE/mmakefile.src @@ -8,4 +8,4 @@ include $(TOP)/config/make.cfg ICONS := uae #MM- iconset-Gorilla-contrib-icons-extras-clean : iconset-Gorilla-contrib-icons-extras-emu-uae-clean -%build_icons mmake=iconset-Gorilla-contrib-icons-extras-emu-uae icons=$(ICONS) dir=$(CONTRIBDIR)/Emu/UAE +%build_icons mmake=iconset-Gorilla-contrib-icons-extras-emu-uae icons=$(ICONS) dir=$(AROS_CONTRIB)/Emu/UAE diff --git a/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/Emu/mmakefile.src b/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/Emu/mmakefile.src index 577a1ed94..13d5974ce 100644 --- a/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/Emu/mmakefile.src +++ b/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/Emu/mmakefile.src @@ -8,4 +8,4 @@ include $(TOP)/config/make.cfg ICONS := E-UAE UAE #MM- iconset-Gorilla-contrib-icons-extras-clean : iconset-Gorilla-contrib-icons-extras-emu-clean -%build_icons mmake=iconset-Gorilla-contrib-icons-extras-emu icons=$(ICONS) dir=$(CONTRIBDIR)/Emu +%build_icons mmake=iconset-Gorilla-contrib-icons-extras-emu icons=$(ICONS) dir=$(AROS_CONTRIB)/Emu diff --git a/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/FryingPan/mmakefile.src b/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/FryingPan/mmakefile.src index b89f9a2cd..de5f08cb0 100644 --- a/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/FryingPan/mmakefile.src +++ b/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/FryingPan/mmakefile.src @@ -8,4 +8,4 @@ include $(TOP)/config/make.cfg ICONS := FryingPan #MM- iconset-Gorilla-contrib-icons-extras-clean : iconset-Gorilla-contrib-icons-extras-fryingpan-clean -%build_icons mmake=iconset-Gorilla-contrib-icons-extras-fryingpan icons=$(ICONS) dir=$(CONTRIBDIR)/FryingPan +%build_icons mmake=iconset-Gorilla-contrib-icons-extras-fryingpan icons=$(ICONS) dir=$(AROS_CONTRIB)/FryingPan diff --git a/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/Games/mmakefile.src b/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/Games/mmakefile.src index 65502885e..543600af5 100644 --- a/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/Games/mmakefile.src +++ b/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/Games/mmakefile.src @@ -20,4 +20,4 @@ ICONS := AmiChess \ Yahzee #MM- iconset-Gorilla-contrib-icons-extras-clean : iconset-Gorilla-contrib-icons-extras-games-clean -%build_icons mmake=iconset-Gorilla-contrib-icons-extras-games icons=$(ICONS) dir=$(CONTRIBDIR)/Games +%build_icons mmake=iconset-Gorilla-contrib-icons-extras-games icons=$(ICONS) dir=$(AROS_CONTRIB)/Games diff --git a/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/MultiMedia/AMP2/mmakefile.src b/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/MultiMedia/AMP2/mmakefile.src index 439d79df9..8dc7ce914 100644 --- a/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/MultiMedia/AMP2/mmakefile.src +++ b/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/MultiMedia/AMP2/mmakefile.src @@ -8,4 +8,4 @@ include $(TOP)/config/make.cfg ICONS := Plugin AMP #MM- iconset-Gorilla-contrib-icons-extras-mmedia-clean : iconset-Gorilla-contrib-icons-extras-mmedia-amp2-clean -%build_icons mmake=iconset-Gorilla-contrib-icons-extras-mmedia-amp2 icons=$(ICONS) dir=$(CONTRIBDIR)/MultiMedia/AMP2 +%build_icons mmake=iconset-Gorilla-contrib-icons-extras-mmedia-amp2 icons=$(ICONS) dir=$(AROS_CONTRIB)/MultiMedia/AMP2 diff --git a/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/MultiMedia/Gfx/mmakefile.src b/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/MultiMedia/Gfx/mmakefile.src index 37cae3da3..e55f3dd2e 100644 --- a/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/MultiMedia/Gfx/mmakefile.src +++ b/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/MultiMedia/Gfx/mmakefile.src @@ -8,4 +8,4 @@ include $(TOP)/config/make.cfg ICONS := POVRay XaoS #MM- iconset-Gorilla-contrib-icons-extras-mmedia-clean : iconset-Gorilla-contrib-icons-extras-mmedia-gfx-clean -%build_icons mmake=iconset-Gorilla-contrib-icons-extras-mmedia-gfx icons=$(ICONS) dir=$(CONTRIBDIR)/MultiMedia/Gfx +%build_icons mmake=iconset-Gorilla-contrib-icons-extras-mmedia-gfx icons=$(ICONS) dir=$(AROS_CONTRIB)/MultiMedia/Gfx diff --git a/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/MultiMedia/mmakefile.src b/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/MultiMedia/mmakefile.src index 0f9f3e7b0..712b291e7 100644 --- a/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/MultiMedia/mmakefile.src +++ b/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/MultiMedia/mmakefile.src @@ -8,4 +8,4 @@ include $(TOP)/config/make.cfg ICONS := AMP2 Audio Gfx Video #MM- iconset-Gorilla-contrib-icons-extras-clean : iconset-Gorilla-contrib-icons-extras-mmedia-clean -%build_icons mmake=iconset-Gorilla-contrib-icons-extras-mmedia icons=$(ICONS) dir=$(CONTRIBDIR)/MultiMedia +%build_icons mmake=iconset-Gorilla-contrib-icons-extras-mmedia icons=$(ICONS) dir=$(AROS_CONTRIB)/MultiMedia diff --git a/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/Networking/Apps/AiRcOS/mmakefile.src b/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/Networking/Apps/AiRcOS/mmakefile.src index aed332595..ebd8a958a 100644 --- a/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/Networking/Apps/AiRcOS/mmakefile.src +++ b/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/Networking/Apps/AiRcOS/mmakefile.src @@ -7,4 +7,4 @@ include $(TOP)/config/make.cfg ICONS := AiRcOS -%build_icons mmake=iconset-Gorilla-contrib-icons-aircos-app icons=$(ICONS) dir=$(CONTRIBDIR)/Networking/Apps/AiRcOS +%build_icons mmake=iconset-Gorilla-contrib-icons-aircos-app icons=$(ICONS) dir=$(AROS_CONTRIB)/Networking/Apps/AiRcOS diff --git a/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/Networking/Apps/OWB/mmakefile.src b/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/Networking/Apps/OWB/mmakefile.src index 706d21d28..5af33995a 100644 --- a/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/Networking/Apps/OWB/mmakefile.src +++ b/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/Networking/Apps/OWB/mmakefile.src @@ -7,4 +7,4 @@ include $(TOP)/config/make.cfg ICONS := OWB -%build_icons mmake=iconset-Gorilla-contrib-icons-owb-app icons=$(ICONS) dir=$(CONTRIBDIR)/Networking/Apps/OWB +%build_icons mmake=iconset-Gorilla-contrib-icons-owb-app icons=$(ICONS) dir=$(AROS_CONTRIB)/Networking/Apps/OWB diff --git a/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/Networking/Apps/mmakefile.src b/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/Networking/Apps/mmakefile.src index df948d1cb..352947504 100644 --- a/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/Networking/Apps/mmakefile.src +++ b/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/Networking/Apps/mmakefile.src @@ -13,6 +13,6 @@ OWBICON := OWB MARRANOFTPICON := MarranoFTP #MM- iconset-Gorilla-contrib-icons-extras-networking-clean : iconset-Gorilla-contrib-icons-extras-networking-apps-clean -%build_icons mmake=iconset-Gorilla-contrib-icons-aircos icons=$(AIRCOSICON) dir=$(CONTRIBDIR)/Networking/Apps -%build_icons mmake=iconset-Gorilla-contrib-icons-owb icons=$(OWBICON) dir=$(CONTRIBDIR)/Networking/Apps -%build_icons mmake=iconset-Gorilla-contrib-icons-marranoftp icons=$(MARRANOFTPICON) dir=$(CONTRIBDIR)/Networking/Apps +%build_icons mmake=iconset-Gorilla-contrib-icons-aircos icons=$(AIRCOSICON) dir=$(AROS_CONTRIB)/Networking/Apps +%build_icons mmake=iconset-Gorilla-contrib-icons-owb icons=$(OWBICON) dir=$(AROS_CONTRIB)/Networking/Apps +%build_icons mmake=iconset-Gorilla-contrib-icons-marranoftp icons=$(MARRANOFTPICON) dir=$(AROS_CONTRIB)/Networking/Apps diff --git a/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/Networking/mmakefile.src b/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/Networking/mmakefile.src index 43f6be1f6..534345e05 100644 --- a/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/Networking/mmakefile.src +++ b/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/Networking/mmakefile.src @@ -8,4 +8,4 @@ include $(TOP)/config/make.cfg ICONS := Apps #MM- iconset-Gorilla-contrib-icons-extras-clean : iconset-Gorilla-contrib-icons-extras-networking-clean -%build_icons mmake=iconset-Gorilla-contrib-icons-extras-networking icons=$(ICONS) dir=$(CONTRIBDIR)/Networking +%build_icons mmake=iconset-Gorilla-contrib-icons-extras-networking icons=$(ICONS) dir=$(AROS_CONTRIB)/Networking diff --git a/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/Office/MUIbase/mmakefile.src b/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/Office/MUIbase/mmakefile.src index 819c92822..33f1d7819 100644 --- a/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/Office/MUIbase/mmakefile.src +++ b/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/Office/MUIbase/mmakefile.src @@ -8,4 +8,4 @@ include $(TOP)/config/make.cfg ICONS := MUIbase #MM- iconset-Gorilla-contrib-icons-extras-office-clean : iconset-Gorilla-contrib-icons-extras-office-muibase-clean -%build_icons mmake=iconset-Gorilla-contrib-icons-extras-office-muibase icons=$(ICONS) dir=$(CONTRIBDIR)/Office/MUIbase +%build_icons mmake=iconset-Gorilla-contrib-icons-extras-office-muibase icons=$(ICONS) dir=$(AROS_CONTRIB)/Office/MUIbase diff --git a/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/Office/mmakefile.src b/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/Office/mmakefile.src index 66b174dfd..6cb8a78b8 100644 --- a/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/Office/mmakefile.src +++ b/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/Office/mmakefile.src @@ -9,4 +9,4 @@ include $(TOP)/config/make.cfg ICONS := MUIbase #MM- iconset-Gorilla-contrib-icons-extras-clean : iconset-Gorilla-contrib-icons-extras-office-clean -%build_icons mmake=iconset-Gorilla-contrib-icons-extras-office icons=$(ICONS) dir=$(CONTRIBDIR)/Office +%build_icons mmake=iconset-Gorilla-contrib-icons-extras-office icons=$(ICONS) dir=$(AROS_CONTRIB)/Office diff --git a/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/mmakefile.src b/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/mmakefile.src index f871da064..f258cd17d 100644 --- a/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/mmakefile.src +++ b/images/IconSets/Gorilla/Icons/Medium/AROS/Extras/mmakefile.src @@ -9,4 +9,4 @@ ICONS := MultiMedia DOpus Demos Development Emu Games Networking Office \ Utilities System FryingPan #MM- iconset-Gorilla-contrib-icons-clean : iconset-Gorilla-contrib-icons-extras-clean -%build_icons mmake=iconset-Gorilla-contrib-icons-extras icons=$(ICONS) dir=$(CONTRIBDIR) +%build_icons mmake=iconset-Gorilla-contrib-icons-extras icons=$(ICONS) dir=$(AROS_CONTRIB) diff --git a/mui/classes/mailtext/mmakefile.src b/mui/classes/mailtext/mmakefile.src index c5757ef17..d2e392541 100644 --- a/mui/classes/mailtext/mmakefile.src +++ b/mui/classes/mailtext/mmakefile.src @@ -55,7 +55,7 @@ USER_CFLAGS += $(PARANOIA_CFLAGS) files=$(MCPFILES) objdir=$(OBJDIR)/mcp moduledir=Extras/Zune/MCC_Mailtext/Classes/Zune %build_prog mmake=contrib-zune-classes-mailtext-demo progname=Show_Mailtext files=show_mailtext \ - targetdir=$(CONTRIBDIR)/Zune/MCC_Mailtext/Demos + targetdir=$(AROS_CONTRIB)/Zune/MCC_Mailtext/Demos #MM contrib-zune-classes-mailtext-catalogs-setup : %rule_makedirs dirs=$(TOP)/$(CURDIR)/loc setuptarget=contrib-zune-classes-mailtext-catalogs-setup diff --git a/mui/classes/mailtext/s/mmakefile.src b/mui/classes/mailtext/s/mmakefile.src index 431f26e98..ceb2a461a 100644 --- a/mui/classes/mailtext/s/mmakefile.src +++ b/mui/classes/mailtext/s/mmakefile.src @@ -14,4 +14,4 @@ contrib-zune-classes-mailtext-envpackage : #MM- contrib-zune-classes-mailtext-mcp : contrib-zune-classes-mailtext-startup -%copy_files_q mmake=contrib-zune-classes-mailtext-startupfiles dst=$(CONTRIBDIR)/Zune/MCC_Mailtext/S +%copy_files_q mmake=contrib-zune-classes-mailtext-startupfiles dst=$(AROS_CONTRIB)/Zune/MCC_Mailtext/S diff --git a/mui/classes/popph/s/mmakefile.src b/mui/classes/popph/s/mmakefile.src index 461c04a21..923f18189 100644 --- a/mui/classes/popph/s/mmakefile.src +++ b/mui/classes/popph/s/mmakefile.src @@ -12,4 +12,4 @@ FILES := Package-Startup Package-Shutdown contrib-zune-classes-popph-envpackage : $(ECHO) "Extras:Zune/MCC_Popph" >$(AROS_PACKAGES)/MCC_Popph -%copy_files_q mmake=contrib-zune-classes-popph-startupfiles dst=$(CONTRIBDIR)/Zune/MCC_Popph/S +%copy_files_q mmake=contrib-zune-classes-popph-startupfiles dst=$(AROS_CONTRIB)/Zune/MCC_Popph/S diff --git a/mui/classes/thebar/aros/s/mmakefile.src b/mui/classes/thebar/aros/s/mmakefile.src index 4130297bb..64442cc06 100644 --- a/mui/classes/thebar/aros/s/mmakefile.src +++ b/mui/classes/thebar/aros/s/mmakefile.src @@ -15,5 +15,5 @@ contrib-zune-classes-thebar-envpackage : #MM- contrib-zune-classes-thebar-mccv : contrib-zune-classes-thebar-startup #MM- contrib-zune-classes-thebar-mcp : contrib-zune-classes-thebar-startup -%copy_files_q mmake=contrib-zune-classes-thebar-startupfiles dst=$(CONTRIBDIR)/Zune/MCC_TheBar/s +%copy_files_q mmake=contrib-zune-classes-thebar-startupfiles dst=$(AROS_CONTRIB)/Zune/MCC_TheBar/s diff --git a/mui/classes/toolbar/Demos/mmakefile.src b/mui/classes/toolbar/Demos/mmakefile.src index 87e497ed0..b910d4365 100644 --- a/mui/classes/toolbar/Demos/mmakefile.src +++ b/mui/classes/toolbar/Demos/mmakefile.src @@ -4,7 +4,7 @@ include $(TOP)/config/make.cfg FILES := Toolbar-Demo -EXEDIR := $(CONTRIBDIR)/Zune/MCC_Toolbar/Demos +EXEDIR := $(AROS_CONTRIB)/Zune/MCC_Toolbar/Demos USER_CFLAGS := -DNO_INLINE_STDARG USER_CFLAGS += $(PARANOIA_CFLAGS) diff --git a/mui/classes/toolbar/Developer/C/Examples/mmakefile.src b/mui/classes/toolbar/Developer/C/Examples/mmakefile.src index 5c0783516..eea6f33bb 100644 --- a/mui/classes/toolbar/Developer/C/Examples/mmakefile.src +++ b/mui/classes/toolbar/Developer/C/Examples/mmakefile.src @@ -4,7 +4,7 @@ include $(TOP)/config/make.cfg FILES := Toolbar-Demo -EXEDIR := $(CONTRIBDIR)/Zune/MCC_Toolbar/Demos +EXEDIR := $(AROS_CONTRIB)/Zune/MCC_Toolbar/Demos USER_INCLUDES := -I$(SRCDIR)/$(CURDIR)/../../../../commonaros USER_CFLAGS := -DNO_INLINE_STDARG diff --git a/mui/classes/toolbar/Source/Toolbar_mcc/mmakefile.src b/mui/classes/toolbar/Source/Toolbar_mcc/mmakefile.src index a98768811..79cc72fa1 100644 --- a/mui/classes/toolbar/Source/Toolbar_mcc/mmakefile.src +++ b/mui/classes/toolbar/Source/Toolbar_mcc/mmakefile.src @@ -16,7 +16,7 @@ FILES := Dispatcher \ ShowHide %build_module_simple mmake=contrib-zune-classes-toolbar-class \ - modname=Toolbar modtype=mcc moduledir=$(CONTRIBDIR)/Zune/MCC_Toolbar/Classes/Zune/ \ + modname=Toolbar modtype=mcc moduledir=$(AROS_CONTRIB)/Zune/MCC_Toolbar/Classes/Zune/ \ files="library $(FILES)" diff --git a/mui/classes/toolbar/Source/Toolbar_mcp/mmakefile.src b/mui/classes/toolbar/Source/Toolbar_mcp/mmakefile.src index 9bbac52ba..1bfb685fe 100644 --- a/mui/classes/toolbar/Source/Toolbar_mcp/mmakefile.src +++ b/mui/classes/toolbar/Source/Toolbar_mcp/mmakefile.src @@ -12,6 +12,6 @@ FILES := library \ MyLocale %build_module_simple mmake=contrib-zune-classes-toolbar-mcp \ - modname=Toolbar modtype=mcp moduledir=$(CONTRIBDIR)/Zune/MCC_Toolbar/Classes/Zune \ + modname=Toolbar modtype=mcp moduledir=$(AROS_CONTRIB)/Zune/MCC_Toolbar/Classes/Zune \ files="$(FILES)" diff --git a/mui/classes/toolbar/s/mmakefile.src b/mui/classes/toolbar/s/mmakefile.src index e00630d8f..55838fce8 100644 --- a/mui/classes/toolbar/s/mmakefile.src +++ b/mui/classes/toolbar/s/mmakefile.src @@ -14,4 +14,4 @@ contrib-zune-classes-toolbar-envpackage : #MM- contrib-zune-classes-toolbar-mcp : contrib-zune-classes-toolbar-startup -%copy_files_q mmake=contrib-zune-classes-toolbar-startupfiles dst=$(CONTRIBDIR)/Zune/MCC_Toolbar/s +%copy_files_q mmake=contrib-zune-classes-toolbar-startupfiles dst=$(AROS_CONTRIB)/Zune/MCC_Toolbar/s diff --git a/mui/classes/urltext/s/mmakefile.src b/mui/classes/urltext/s/mmakefile.src index 6935c23bb..8a7d47ded 100644 --- a/mui/classes/urltext/s/mmakefile.src +++ b/mui/classes/urltext/s/mmakefile.src @@ -17,4 +17,4 @@ contrib-zune-classes-urltext-envpackage : #MM- contrib-zune-classes-urltext-mcp : contrib-zune-classes-urltext-startup -%copy_files_q mmake=contrib-zune-classes-urltext-startupfiles dst=$(CONTRIBDIR)/Zune/MCC_Urltext/s +%copy_files_q mmake=contrib-zune-classes-urltext-startupfiles dst=$(AROS_CONTRIB)/Zune/MCC_Urltext/s diff --git a/mui/madmatrix/mmakefile.src b/mui/madmatrix/mmakefile.src index 266d61a26..fda1005ea 100644 --- a/mui/madmatrix/mmakefile.src +++ b/mui/madmatrix/mmakefile.src @@ -6,7 +6,7 @@ include $(TOP)/config/make.cfg FILES := main alloctab libs madmatrix -EXEDIR := $(CONTRIBDIR)/aminet +EXEDIR := $(AROS_CONTRIB)/aminet USER_INCLUDES := -I$(SRCDIR)/$(CURDIR)/../libs/muimaster diff --git a/regina/demo/mmakefile b/regina/demo/mmakefile index f2cf92c68..edb0965ec 100644 --- a/regina/demo/mmakefile +++ b/regina/demo/mmakefile @@ -1,6 +1,6 @@ include $(TOP)/config/make.cfg -TARGETDIR := $(CONTRIBDIR)/Regina/demo +TARGETDIR := $(AROS_CONTRIB)/Regina/demo FILES := \ animal.rexx \ diff --git a/regina/mmakefile.src b/regina/mmakefile.src index 951d50933..a4630554f 100644 --- a/regina/mmakefile.src +++ b/regina/mmakefile.src @@ -21,7 +21,7 @@ include $(SRCDIR)/$(CURDIR)/regina.ver #MM contrib-regina-module-quick : contrib-regina-module -EXEDIR := $(CONTRIBDIR)/Regina +EXEDIR := $(AROS_CONTRIB)/Regina # At the moment don't support threads. # Files shared by executables and shared library diff --git a/regina/trip/mmakefile.src b/regina/trip/mmakefile.src index 30d3c1644..5c14c9473 100644 --- a/regina/trip/mmakefile.src +++ b/regina/trip/mmakefile.src @@ -1,6 +1,6 @@ include $(TOP)/config/make.cfg -TARGETDIR := $(CONTRIBDIR)/Regina/trip +TARGETDIR := $(AROS_CONTRIB)/Regina/trip REXXFILES := \ arith.rexx \ diff --git a/rexx/progs/mmakefile.src b/rexx/progs/mmakefile.src index 8d468c941..ebeeed547 100644 --- a/rexx/progs/mmakefile.src +++ b/rexx/progs/mmakefile.src @@ -4,7 +4,7 @@ include $(TOP)/config/make.cfg -REXXDIR = $(CONTRIBDIR)/Rexx +REXXDIR = $(AROS_CONTRIB)/Rexx DESTDIR = $(REXXDIR)/progs FILES = 3dplot.r \ diff --git a/rexx/src/mmakefile.src b/rexx/src/mmakefile.src index 86c5e1fb1..3c32af1d6 100644 --- a/rexx/src/mmakefile.src +++ b/rexx/src/mmakefile.src @@ -28,7 +28,7 @@ FILES := \ bintree \ bmem -EXEDIR := $(CONTRIBDIR)/Rexx +EXEDIR := $(AROS_CONTRIB)/Rexx USER_CFLAGS := -DAROS -I$(SRCDIR)/$(CURDIR)/../inc -DALIGNED diff --git a/scout/source/tbLib/mmakefile.src b/scout/source/tbLib/mmakefile.src index 24cf5a829..39da69171 100644 --- a/scout/source/tbLib/mmakefile.src +++ b/scout/source/tbLib/mmakefile.src @@ -42,6 +42,6 @@ FILES := \ library_CheckLibVersionName %build_linklib mmake=contrib-scout-tblib libname=$(LIB) \ - files=$(FILES) libdir=$(LIBDIR) + files=$(FILES) libdir=$(AROS_LIB) %common diff --git a/sqlite3/mmakefile.src b/sqlite3/mmakefile.src index cfc0c7a16..3eb3e4055 100644 --- a/sqlite3/mmakefile.src +++ b/sqlite3/mmakefile.src @@ -12,12 +12,12 @@ FILES := alter attach auth btree build callback date \ opcodes parse %build_prog mmake=contrib-sqlite3 \ - progname=sqlite targetdir=$(CONTRIBDIR)/daikane \ + progname=sqlite targetdir=$(AROS_CONTRIB)/daikane \ files="$(FILES) shell" \ cflags="-Wall -DOS_AROS -DSQLITE_DEBUG" %build_prog mmake=contrib-sqlite3-test \ - progname=test targetdir=$(CONTRIBDIR)/daikane \ + progname=test targetdir=$(AROS_CONTRIB)/daikane \ files="test" cflags="-Wall" #MM- contrib-sqlite3: \ @@ -47,7 +47,7 @@ contrib-sqlite3-opcodes-c: opcodes.h opcodes.c contrib-sqlite3-doc: doc test-copy: - cp -f test.c $(CONTRIBDIR)/daikane/ + cp -f test.c $(AROS_CONTRIB)/daikane/ # Files to be published on the website. # @@ -92,8 +92,8 @@ DOC = \ whentouse.html doc: common.tcl $(DOC) - @mkdir -p $(CONTRIBDIR)/daikane/doc 2>/dev/null - @mv $(DOC) $(CONTRIBDIR)/daikane/doc/ + @mkdir -p $(AROS_CONTRIB)/daikane/doc 2>/dev/null + @mv $(DOC) $(AROS_CONTRIB)/daikane/doc/ lemon: tool/lemon.c tool/lempar.c gcc -o lemon tool/lemon.c @@ -172,7 +172,7 @@ docs.html: www/docs.tcl tclsh www/docs.tcl >docs.html download.html: www/download.tcl - @mkdir -p $(CONTRIBDIR)/daikane/doc 2>/dev/null + @mkdir -p $(AROS_CONTRIB)/daikane/doc 2>/dev/null tclsh www/download.tcl >download.html faq.html: www/faq.tcl -- 2.11.4.GIT