From 432bb50dc5c39366706f28d7876406728dd3cb9f Mon Sep 17 00:00:00 2001 From: heck Date: Wed, 26 Aug 2020 23:47:02 +0200 Subject: [PATCH] sensible build defaults --- Makefile.conf | 6 +++--- local.conf.example | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile.conf b/Makefile.conf index cc24c6f..2166eac 100644 --- a/Makefile.conf +++ b/Makefile.conf @@ -9,9 +9,9 @@ PLATFORM:=$(shell uname | tr A-Z a-z) # DEV ENV PATHS & CFG # The dev environment paths and configs are set to a default value which can be overridden by ./local.conf and overridden again by /local.conf ######### Build Config Defaults ######### -DEBUG=1 -PREFIX=$(HOME)/local -YML2_PATH=$(HOME)/yml2 +DEBUG=0 +PREFIX=$(HOME) +YML2_PATH=$(PREFIX)/src/yml2 YML2_PROC=$(YML2_PATH)/yml2proc $(YML2_OPTS) YML2_OPTS=--encoding=utf8 ENGINE_LIB_PATH=$(PREFIX)/lib diff --git a/local.conf.example b/local.conf.example index d550ae5..310de4b 100644 --- a/local.conf.example +++ b/local.conf.example @@ -5,7 +5,7 @@ # These example values here reflect the defaults ############ Install ########### -# PREFIX=$(HOME)/local +# PREFIX=$(HOME) ######### C++ Compiler ######### # Should work with clang and g++ @@ -16,7 +16,7 @@ # JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk1.8.0_231.jdk/Contents/Home ############ YML2 ############## -# YML2_PATH=$(HOME)/code/yml2 +# YML2_PATH=$(HOME)/src/yml2 ########### Engine ############# # ENGINE_LIB_PATH=$(PREFIX)/lib