# HG changeset patch # User Yuya Nishihara # Date 1659606242 -32400 # Thu Aug 04 18:44:02 2022 +0900 # Node ID aa9e5c03ae369a9cc1409d18602a1ab3ed4e98f6 # Parent 2bb7a5b17323496c950ccd63be0e478ba12e70e1 make: require QT_VERSION_MAJOR to select debian packaging data diff --git a/.build.yml b/.build.yml --- a/.build.yml +++ b/.build.yml @@ -44,7 +44,7 @@ make -C hgv clean debug tests QT_VERSION_MAJOR=6 HGROOT="$(pwd)/hg" - build-deb: | - make -C hgv clean deb + make -C hgv clean deb QT_VERSION_MAJOR=5 mkdir hgv-deb mv hgv_*.deb hgv-deb tar zcf hgv-deb.tar.gz hgv-deb diff --git a/Makefile b/Makefile --- a/Makefile +++ b/Makefile @@ -57,8 +57,10 @@ .PHONY: deb deb: + @[ -n "$(QT_VERSION_MAJOR)" ] \ + || { echo '*** specify QT_VERSION_MAJOR=5|6' >&2; exit 1; } $(RM) -R debian - cp -pR contrib/debian-qt5 debian + cp -pR "contrib/debian-qt$(QT_VERSION_MAJOR)" debian $(DEBCHANGE) --create --package hgv -v "$(DEB_VERSION)" "New snapshot build." $(DEBUILD) -uc -us --build=binary