gnucash-on-windows master: Adjust the location of config.h for cmake builds.

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/60de79c2 (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/03fd0779 (commit)



commit 60de79c2fd14d083c226f90bdd1df62a33b113c0
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Jul 11 23:32:38 2016 +0000

    Adjust the location of config.h for cmake builds.

diff --git a/buildserver/build_package.sh b/buildserver/build_package.sh
index 2a0718c..f19f39d 100644
--- a/buildserver/build_package.sh
+++ b/buildserver/build_package.sh
@@ -24,6 +24,7 @@ BUILDSERVER_DIR="$(dirname "$0")"
 GC_WIN_DIR="$BUILDSERVER_DIR/.."
 . "$GC_WIN_DIR/functions.sh"
 . ./defaults.sh
+. ./custom.sh
 
 tag="${1:-$GNUCASH_SCM_REV}"
 
@@ -83,7 +84,11 @@ $_GC_WIN_REPOS_UDIR/dist.sh 2>&1 | tee -a ${LOGFILE}
 # Make sure this logic matches the logic in dist.sh!
 _BUILD_UDIR=`unix_path $BUILD_DIR`
 _GNUCASH_UDIR=`unix_path $GNUCASH_DIR`
-PKG_VERSION=`grep PACKAGE_VERSION ${_BUILD_UDIR}/config.h | cut -d" " -f3 | cut -d\" -f2 `
+_GNUCASH_CONFIG_H=${_BUILD_UDIR}/config.h
+if [ "$WITH_CMAKE" == "yes" ]; then
+  _GNUCASH_CONFIG_H=${_BUILD_UDIR}/src/config.h
+fi
+PKG_VERSION=`grep PACKAGE_VERSION ${_GNUCASH_CONFIG_H}/config.h | cut -d" " -f3 | cut -d\" -f2 `
 REVISION=`grep GNUCASH_SCM_REV ${_BUILD_UDIR}/src/core-utils/gnc-vcs-info.h | cut -d" " -f3 | cut -d\" -f2 `
 
 if [ "$BUILD_FROM_TARBALL" = "no" ]; then



Summary of changes:
 buildserver/build_package.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)