From de2ea71432806facea20aef635d68fc4dd7f3017 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fabian=20Gr=C3=BCnbichler?= Date: Fri, 30 Sep 2016 09:44:37 +0200 Subject: [PATCH] make sure submodule is initialized --- Makefile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index bcae4d2..2b74d16 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ DEB=${PACKAGE}_${VER}-${DEBREL}_${ARCH}.deb all: ${DEB} echo ${DEB} -deb ${DEB}: ${SRCDIR} +deb ${DEB}: submodule rm -rf ${SRCDIR}.tmp cp -rpa ${SRCDIR} ${SRCDIR}.tmp cd ${SRCDIR}.tmp; patch -p1 < ../patches/update_changelog.patch @@ -22,9 +22,14 @@ deb ${DEB}: ${SRCDIR} lintian ${DEB} echo ${DEB} +# make sure submodule was initialized +.PHONY: submodule +submodule: + test -f "${SRCDIR}/debian/changelog" || git submodule update --init + +# upgrade to current master .PHONY: download -download ${SRCDIR}: - git submodule update --init +download ${SRCDIR}: submodule cd ${SRCDIR}; git fetch cd ${SRCDIR}; git merge --ff-only master -- 2.39.2