allow in-tree builds by default

CE-Programming · Jan 19, 2024 · 88cf7d0 · 88cf7d0
1 parent 19517c2
commit 88cf7d0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/.github/workflows/branch.yml b/.github/workflows/branch.yml
@@ -133,7 +133,7 @@ jobs:
       - name: Install Toolchain
         env:
           PREFIX: ${{github.workspace}}
-        run: make -j4 -C ${{env.TOOLCHAIN_PATH}} install V=1
+        run: make -j4 -C ${{env.TOOLCHAIN_PATH}} install V=1 DESTDIR=${{github.workspace}}
 
       - name: Make Binaries Executable
         if: runner.os != 'Windows'

diff --git a/.github/workflows/make.yml b/.github/workflows/make.yml
@@ -135,7 +135,7 @@ jobs:
       - name: Install Toolchain
         env:
           PREFIX: ${{github.workspace}}
-        run: make -j4 -C ${{env.TOOLCHAIN_PATH}} install V=1
+        run: make -j4 -C ${{env.TOOLCHAIN_PATH}} install V=1 DESTDIR=${{github.workspace}}
 
       - name: Make Binaries Executable
         if: runner.os != 'Windows'

diff --git a/makefile b/makefile
@@ -14,6 +14,9 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+DESTDIR = $(CURDIR)/
+PREFIX = CEdev
+
 include $(CURDIR)/src/common.mk
 
 LIBS := libload graphx fontlibc keypadc fileioc usbdrvce srldrvce msddrvce fatdrvce

diff --git a/src/common.mk b/src/common.mk
@@ -16,7 +16,6 @@
 
 GIT_SHA = $(shell git describe --abbrev=8 --dirty --always --tags)
 
-CEDEV_DIR := CEdev
 CEDEV_VERSION := $(GIT_SHA)
 
 LINUX := 0
@@ -51,8 +50,6 @@ REMOVE ?= ( del /f /q $1 2>nul || call )
 RMDIR ?= ( rmdir /s /q $1 2>nul || call )
 COPY ?= ( for %%a in ($(subst $(space),$(comma) ,$1)) do xcopy %%a $2 /Q /Y /I /K 1>nul 2>nul || call )
 COPYDIR ?= ( xcopy $1 $2 /S /Q /Y /I /K 1>nul 2>nul || call )
-DESTDIR ?=
-PREFIX ?= C:
 QUOTE_ARG  ?= "$(subst ",',$1)"#'
 APPEND ?= $(Q)echo.$(subst ",^",$(subst \,^\,$(subst &,^&,$(subst |,^|,$(subst >,^>,$(subst <,^<,$(subst ^,^^,$1))))))) >>$@
 RELEASE_NAME = windows
@@ -67,8 +64,6 @@ REMOVE ?= rm -f $1
 RMDIR ?= rm -rf $1
 COPY ?= cp $1 $2
 COPYDIR ?= cp -r $1 $2
-DESTDIR ?=
-PREFIX ?= $(HOME)
 QUOTE_ARG ?= '$(subst ','\'',$1)'#'
 APPEND ?= $(Q)echo $(call QUOTE_ARG,$1) >>$@
 ifeq ($(shell uname -s),Darwin)
@@ -80,8 +75,8 @@ RELEASE_NAME = linux
 endif
 endif
 
-INSTALL_PATH := $(call QUOTE_ARG,$(call NATIVEPATH,$(DESTDIR)$(PREFIX)))
-INSTALL_DIR := $(DESTDIR)$(PREFIX)/$(CEDEV_DIR)
+INSTALL_DIR := $(DESTDIR)$(PREFIX)
+INSTALL_PATH := $(call QUOTE_ARG,$(call NATIVEPATH,$(INSTALL_DIR)))
 INSTALL_EXAMPLES := $(call QUOTE_ARG,$(call NATIVEPATH,$(INSTALL_DIR)/examples))
 INSTALL_LIB := $(call QUOTE_ARG,$(call NATIVEPATH,$(INSTALL_DIR)/lib/libload))
 INSTALL_CRT := $(call QUOTE_ARG,$(call NATIVEPATH,$(INSTALL_DIR)/lib/crt))