[nautilus] libgd: move submodule to a subdirectory
- From: Ernestas Kulik <ernestask src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus] libgd: move submodule to a subdirectory
- Date: Mon, 27 Mar 2017 09:46:08 +0000 (UTC)
commit ec2af08b38f689607392bf24ee1704f071cb81f8
Author: Ernestas Kulik <ernestask gnome org>
Date: Fri Mar 24 14:46:31 2017 +0200
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
.gitmodules | 6 +++---
build-aux/meson/check_libgd.sh | 2 +-
libgd | 1 -
subprojects/libgd | 2 +-
4 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/.gitmodules b/.gitmodules
index bfd964e..054b71c 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 f1fabc0..9d66d6a 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/subprojects/libgd b/subprojects/libgd
deleted file mode 120000
index 82fb691..0000000
--- a/subprojects/libgd
+++ /dev/null
@@ -1 +0,0 @@
-../libgd
\ No newline at end of file
diff --git a/subprojects/libgd b/subprojects/libgd
new file mode 160000
index 0000000..a4928d0
--- /dev/null
+++ b/subprojects/libgd
@@ -0,0 +1 @@
+Subproject commit a4928d0f5e7aebe7d0670fb65d5b6c1bcbe5dd60
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]