minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 4 Releases Wiki Activity

autogen.sh: Only copy submodules if building from a git branch. 

`autogen.sh` fails if building from a standard source tarball.  Firstly, git
expects to be called in a git repository, then `copy_submodule_files`
blindly attempts to copy files.

Debian, Ubuntu, Linux Mint, and other derivatives all run `autogen.sh`
before compiling to regenerate build files.

This patch ensures that various git commands are only called and 'dlg' files
are only copied if `autogen.sh` is called from a git repository.
This commit is contained in:
Hugh McMaster 2021-10-05 22:21:39 +11:00 committed by Werner Lemberg
parent bbab0a675e
commit 467e49e817
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
autogen.sh
View File

@ -182,17 +182,19 @@ copy_submodule_files ()
cp $DLG_SRC_DIR/* src/dlg
}
DLG_INC_DIR=subprojects/dlg/include/dlg
DLG_SRC_DIR=subprojects/dlg/src/dlg
if test -d ".git"; then
DLG_INC_DIR=subprojects/dlg/include/dlg
DLG_SRC_DIR=subprojects/dlg/src/dlg
if test -d "$DLG_INC_DIR"; then
:
else
echo "Checking out submodule in \`subprojects/dlg':"
git submodule init
git submodule update
if test -d "$DLG_INC_DIR"; then
:
else
echo "Checking out submodule in \`subprojects/dlg':"
git submodule init
git submodule update
fi
copy_submodule_files
fi
copy_submodule_files
# EOF