diff options
author | Werner Lemberg <wl@gnu.org> | 2021-02-16 14:07:18 +0100 |
---|---|---|
committer | Werner Lemberg <wl@gnu.org> | 2021-02-16 14:07:18 +0100 |
commit | 92bd99bd25e93baeff742444dee129629f70e5c8 (patch) | |
tree | f341997072b687f28fccc13f2421ab8ef5316ebb /autogen.sh | |
parent | 215ae253304d610b90778d438abc1d019699ebd8 (diff) | |
download | freetype2-92bd99bd25e93baeff742444dee129629f70e5c8.tar.gz |
Move 'dlg' submodule to `subprojects` directory.
This is for future changes with Meson, which doesn't allow a
different name for its `subprojects` directory. Having both a
`submodules` and a `subprojects` directory is confusing.
* .gitmodules, autogen.sh (copy_submodule_files, DLG_INC_DIR,
DLG_SRC_DIR): Updated.
* builds/toplevel.mk (<top-level>, do-dist),
builds/windows/vc2010/script.bat: Updated.
* src/tools/no-copyright: Updated.
Diffstat (limited to 'autogen.sh')
-rwxr-xr-x | autogen.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/autogen.sh b/autogen.sh index 1c7e8153d..6503975d1 100755 --- a/autogen.sh +++ b/autogen.sh @@ -172,18 +172,18 @@ chmod +x ./configure # Copy all necessary 'dlg' files. copy_submodule_files () { - echo "Copying files from \`submodules/dlg' to \`src/dlg' and \`include/dlg'" + echo "Copying files from \`subprojects/dlg' to \`src/dlg' and \`include/dlg'" mkdir include/dlg 2> /dev/null cp $DLG_INC_DIR/output.h include/dlg cp $DLG_INC_DIR/dlg.h include/dlg cp $DLG_SRC_DIR/* src/dlg } -DLG_INC_DIR=submodules/dlg/include/dlg -DLG_SRC_DIR=submodules/dlg/src/dlg +DLG_INC_DIR=subprojects/dlg/include/dlg +DLG_SRC_DIR=subprojects/dlg/src/dlg if ! test -d "$DLG_INC_DIR"; then - echo "Checking out submodule in \`submodules/dlg':" + echo "Checking out submodule in \`subprojects/dlg':" git submodule init git submodule update fi |