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

This commit is contained in:
Laurence Withers 2007-01-21 12:16:59 +00:00
commit bc691b8d77
7 changed files with 5 additions and 4 deletions

View File

@ -5,6 +5,7 @@ then
fi fi
do_parameter_subst do_parameter_subst
add_config_option "DOCSDIR" "${COPT_DOCSDIR_DEFAULT}"
true true
# kate: replace-trailing-space-save true; space-indent true; tab-width 4; # kate: replace-trailing-space-save true; space-indent true; tab-width 4;

View File

@ -7,7 +7,7 @@ build_dir_tree "${FILESDIR}" || return 1
# copy across the Doxygen-generated documentation # copy across the Doxygen-generated documentation
for file in src/@NAME@/* for file in src/@NAME@/*
do do
[ "$(echo $(basename ${file})) | cut -b6)" == "build." ] && continue [ "$(echo $(basename ${file}) | cut -b1-6)" == "build." ] && continue
do_cmd cp -a ${file} ${FILESDIR} || return 1 do_cmd cp -a ${file} ${FILESDIR} || return 1
done done

View File

@ -5,7 +5,6 @@ then
fi fi
do_parameter_subst do_parameter_subst
add_config_option "FILESDIR" "${COPT_FILESDIR_DEFAULT}"
true true
# kate: replace-trailing-space-save true; space-indent true; tab-width 4; # kate: replace-trailing-space-save true; space-indent true; tab-width 4;

View File

@ -90,6 +90,7 @@ done
[ "${echo_exec_prefix}" == "yes" ] && echo "${exec_prefix}" [ "${echo_exec_prefix}" == "yes" ] && echo "${exec_prefix}"
[ "${echo_cflags}" == "yes" ] && echo "${dep_cflags} ${includes}" [ "${echo_cflags}" == "yes" ] && echo "${dep_cflags} ${includes}"
[ "${echo_libs}" == "yes" ] && echo "${dep_libs} -L${lib_dir} -l@NAMEMINUSL@" [ "${echo_libs}" == "yes" ] && echo "${dep_libs} -L${lib_dir} -l@NAMEMINUSL@"
true

View File

@ -90,6 +90,7 @@ done
[ "${echo_exec_prefix}" == "yes" ] && echo "${exec_prefix}" [ "${echo_exec_prefix}" == "yes" ] && echo "${exec_prefix}"
[ "${echo_cflags}" == "yes" ] && echo "${dep_cflags} ${includes}" [ "${echo_cflags}" == "yes" ] && echo "${dep_cflags} ${includes}"
[ "${echo_libs}" == "yes" ] && echo "${dep_libs} -L${lib_dir} -l@NAMEMINUSL@" [ "${echo_libs}" == "yes" ] && echo "${dep_libs} -L${lib_dir} -l@NAMEMINUSL@"
true

View File

@ -93,8 +93,7 @@ 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"
COPT_QTSTUFF_DEFAULT='-I${QTDIR}/include -L${QTDIR}/lib -lqt-mt' COPT_QTSTUFF_DEFAULT='-I${QTDIR}/include -L${QTDIR}/lib -lqt-mt'
COPT_FILESDIR_DEFAULT='${PREFIX}/share/@P@/@NAME@' COPT_DOCSDIR_DEFAULT="\${PREFIX}/doc/${P}"
if [ ! -e "src" ] if [ ! -e "src" ]

0
skel/config Executable file → Normal file
View File