mirror of
https://github.com/Gnucash/gnucash.git
synced 2025-02-25 18:55:30 -06:00
Do not simply touch install-sh because we need that from automake
--add-missing. Warn the user if he has put install.sh in ., .., or ..\.. from the repository. Improves r15037. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@15092 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
parent
8ba8f89376
commit
6ff291e2c9
@ -83,6 +83,24 @@ function add_to_env() {
|
||||
}
|
||||
|
||||
function prepare() {
|
||||
# Necessary so that intltoolize doesn't come up with some
|
||||
# foolish AC_CONFIG_AUX_DIR; bug#362006
|
||||
# We cannot simply create install-sh in the repository, because
|
||||
# this will confuse other parts of the tools
|
||||
_REPOS_UDIR=`unix_path $REPOS_DIR`
|
||||
level0=.
|
||||
level1=$(basename ${_REPOS_UDIR})
|
||||
level2=$(basename $(dirname ${_REPOS_UDIR}))"/"$level1
|
||||
for mydir in $level0 $level1 $level2; do
|
||||
if [ -f $mydir/gnucash.m4 ]; then
|
||||
die "Do not save install.sh in the repository or one its parent directories"
|
||||
fi
|
||||
done
|
||||
# Remove old empty install-sh files
|
||||
if [ -f ${_REPOS_UDIR}/install-sh -a "$(cat ${_REPOS_UDIR}/install-sh | wc -l)" -eq 0 ]; then
|
||||
rm -f ${_REPOS_UDIR}/install-sh
|
||||
fi
|
||||
|
||||
mkdir -p $TMP_DIR
|
||||
mkdir -p $DOWNLOAD_DIR
|
||||
for _ENV in $ENV_VARS; do
|
||||
@ -705,9 +723,6 @@ function inst_gnucash() {
|
||||
_GNUCASH_WFSDIR=`win_fs_path $GNUCASH_DIR`
|
||||
_GNUCASH_UDIR=`unix_path $GNUCASH_DIR`
|
||||
qpushd $REPOS_DIR
|
||||
# Necessary so that intltoolize doesn't come up with some
|
||||
# foolish AC_CONFIG_AUX_DIR; bug#362006
|
||||
touch install-sh
|
||||
if test "x$cross_compile" = xyes ; then
|
||||
# Set these variables manually because of cross-compiling
|
||||
export GUILE_LIBS="${GUILE_LDFLAGS} -lguile -lguile-ltdl"
|
||||
|
Loading…
Reference in New Issue
Block a user