Merge branch 'master' of tourmaline:git/lw-build-system
This commit is contained in:
commit
759e102e76
|
@ -85,10 +85,10 @@ add_config_option() {
|
||||||
}
|
}
|
||||||
COPT_BINDIR_DEFAULT='${PREFIX}/bin'
|
COPT_BINDIR_DEFAULT='${PREFIX}/bin'
|
||||||
COPT_LIBDIR_DEFAULT='${PREFIX}/lib'
|
COPT_LIBDIR_DEFAULT='${PREFIX}/lib'
|
||||||
COPT_HEXDIR_DEFAULT="hexdir"
|
COPT_HEXDIR_DEFAULT='${PREFIX}/hexdir'
|
||||||
COPT_INCLUDEDIR_DEFAULT='${PREFIX}/include'
|
COPT_INCLUDEDIR_DEFAULT='${PREFIX}/include'
|
||||||
COPT_FINALLIBDIR_DEFAULT='${LIBDIR}'
|
COPT_FINALLIBDIR_DEFAULT='${LIBDIR}'
|
||||||
COPT_FINALLINCLUDEDIR_DEFAULT='${INCLUDEDIR}'
|
COPT_FINALINCLUDEDIR_DEFAULT='${INCLUDEDIR}'
|
||||||
COPT_CC_DEFAULT="gcc"
|
COPT_CC_DEFAULT="gcc"
|
||||||
COPT_CXX_DEFAULT="g++"
|
COPT_CXX_DEFAULT="g++"
|
||||||
COPT_CFLAGS_DEFAULT="-g -O2 -W -Wall"
|
COPT_CFLAGS_DEFAULT="-g -O2 -W -Wall"
|
||||||
|
|
|
@ -10,7 +10,12 @@
|
||||||
# This file is the script used to build @P@. There are some
|
# This file is the script used to build @P@. There are some
|
||||||
# options that can be edited; these are set in the file 'config' (or you
|
# options that can be edited; these are set in the file 'config' (or you
|
||||||
# can pass them in as environment variables).
|
# can pass them in as environment variables).
|
||||||
source config || exit 1
|
if [ ! -e "config" ]
|
||||||
|
then
|
||||||
|
echo "Configuration file not found???"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
source "config" # don't fail on error, since last command in config might return false
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -256,6 +261,7 @@ do
|
||||||
echo "Cleaning..."
|
echo "Cleaning..."
|
||||||
rm -rf ${OUTPUT_DIRS}
|
rm -rf ${OUTPUT_DIRS}
|
||||||
print_success "Done"
|
print_success "Done"
|
||||||
|
true
|
||||||
;;
|
;;
|
||||||
|
|
||||||
# bad Kdevelop! bad!
|
# bad Kdevelop! bad!
|
||||||
|
|
Loading…
Reference in New Issue