diff options
| author | Ernestas Kulik <ernestask@gnome.org> | 2017-03-24 14:46:31 +0200 |
|---|---|---|
| committer | Ernestas Kulik <ernestask@gnome.org> | 2017-03-27 12:45:56 +0300 |
| commit | ec2af08b38f689607392bf24ee1704f071cb81f8 (patch) | |
| tree | dc6dfaaf209401ebfce767004370476fe6c87fc0 | |
| parent | f63a5881387f0d97684d1c57ba38ce06d3f75008 (diff) | |
| download | nautilus-ec2af08b38f689607392bf24ee1704f071cb81f8.tar.gz | |
libgd: move submodule to a subdirectory
Meson looks for subprojects in subprojects/ by default. Since Autotools
is no longer a resident here, the submodule should be moved to the
subdirectory, instead of being linked to.
https://bugzilla.gnome.org/show_bug.cgi?id=780501
| -rw-r--r-- | .gitmodules | 6 | ||||
| -rwxr-xr-x | build-aux/meson/check_libgd.sh | 2 | ||||
| m--------- | libgd | 0 | ||||
| m---------[l---------] | subprojects/libgd | 1 |
4 files changed, 4 insertions, 5 deletions
diff --git a/.gitmodules b/.gitmodules index bfd964e3a..054b71cc1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "libgd"] - path = libgd - url = git://git.gnome.org/libgd +[submodule "subprojects/libgd"] + path = subprojects/libgd + url = https://git.gnome.org/browse/libgd diff --git a/build-aux/meson/check_libgd.sh b/build-aux/meson/check_libgd.sh index f1fabc0c3..9d66d6a6c 100755 --- a/build-aux/meson/check_libgd.sh +++ b/build-aux/meson/check_libgd.sh @@ -4,5 +4,5 @@ if [ ! -f "${MESON_SOURCE_ROOT}/libgd/meson.build" ] then git \ --git-dir="${MESON_SOURCE_ROOT}/.git" \ - submodule update --init libgd + submodule update --init subprojects/libgd fi diff --git a/libgd b/libgd deleted file mode 160000 -Subproject 8bb1aebf7f2488fb81052732224a8ec79c36fcf diff --git a/subprojects/libgd b/subprojects/libgd +Subproject a4928d0f5e7aebe7d0670fb65d5b6c1bcbe5dd6 |