Merge branch 'master' of tourmaline:git/lw-build-system

This commit is contained in:
Laurence Withers 2006-12-13 18:07:51 +00:00
commit 759e102e76
2 changed files with 9 additions and 3 deletions

View file

@ -85,10 +85,10 @@ add_config_option() {
}
COPT_BINDIR_DEFAULT='${PREFIX}/bin'
COPT_LIBDIR_DEFAULT='${PREFIX}/lib'
COPT_HEXDIR_DEFAULT="hexdir"
COPT_HEXDIR_DEFAULT='${PREFIX}/hexdir'
COPT_INCLUDEDIR_DEFAULT='${PREFIX}/include'
COPT_FINALLIBDIR_DEFAULT='${LIBDIR}'
COPT_FINALLINCLUDEDIR_DEFAULT='${INCLUDEDIR}'
COPT_FINALINCLUDEDIR_DEFAULT='${INCLUDEDIR}'
COPT_CC_DEFAULT="gcc"
COPT_CXX_DEFAULT="g++"
COPT_CFLAGS_DEFAULT="-g -O2 -W -Wall"