--- src/makefile	2023-08-11 07:33:05.000000000 +0800
+++ src/makefile	2023-08-20 11:27:22.000000000 +0800
@@ -85,16 +85,16 @@
 # parser
 YACC=bison
 # c compiler
-CC=gcc
+CC=@CC@
 # c++ compiler
-CXX=g++
+CXX=@CXX@
 # linker
-LD=g++
+LD=@CXX@
 
 
 ############################# COMPILER FLAGS ##################################
 # note: to compile with a specific c++ version (e.g., c++11) add: -std=c++11
-CFLAGS+=-I. -I$(CK_CORE_DIR) -I$(CK_CORE_DIR)/lo
+CFLAGS+=-I. -I$(CK_CORE_DIR) -I$(CK_CORE_DIR)/lo @CXXFLAGS@
 
 # track stats?
 ifneq ($(CHUCK_STAT),)
@@ -204,22 +204,6 @@
 # for liblo headers
 LO_CFLAGS=-DHAVE_CONFIG_H -I.
 
-# remove -arch options
-CFLAGSDEPEND=$(CFLAGS)
-
-ifneq (,$(ARCHS))
-ARCHOPTS=$(addprefix -arch ,$(ARCHS))
-else
-ARCHOPTS=
-endif
-
-# macOS universal binary
-ifneq (,$(strip $(filter mac-ub,$(MAKECMDGOALS))))
-ARCHOPTS=-arch arm64 -arch x86_64
-ARCH_ARGS=MAC_UB=true
-CFLAGS+=-D__MACOS_UB__
-endif
-
 
 ############################ DISTRIBUTION INFO ################################
 # release notes
@@ -287,7 +271,7 @@
 
 ########################## MANUAL INSTALL ###################################
 # manually install chuck
-DESTDIR?=/usr/local/bin
+DESTDIR?=@PREFIX@/bin
 
 install:
 	mkdir -p $(DESTDIR)

--- src/core/makefile	2023-08-11 07:33:05.000000000 +0800
+++ src/core/makefile	2023-08-20 10:54:01.000000000 +0800
@@ -12,9 +12,9 @@
 
 LEX=flex
 YACC=bison
-CC=gcc
-CXX=g++
-LD=g++
+CC=@CC@
+CXX=@CXX@
+LD=@CXX@
 
 CFLAGS+=-I. -Ilo
 
@@ -106,20 +106,6 @@
 
 LO_CFLAGS=-DHAVE_CONFIG_H -I.
 
-# remove -arch options
-CFLAGSDEPEND=$(CFLAGS)
-
-ifneq (,$(ARCHS))
-ARCHOPTS=$(addprefix -arch ,$(ARCHS))
-else
-ARCHOPTS=
-endif
-
-# 1.4.1.1 (ge) intel/apple silicon universal binary
-ifneq (,$(MAC_UB))
-ARCHOPTS=-arch arm64 -arch x86_64
-endif
-
 # pull in dependency info for *existing* .o files
 -include $(OBJS:.o=.d)