[LyX/master] Update lyx-build script

Richard Kimberly Heck rikiheck at lyx.org
Sun Oct 25 02:55:26 UTC 2020


commit c4620152ce239b3c5d56fef79e7c77ed20bce2fe
Author: Richard Kimberly Heck <rikiheck at lyx.org>
Date:   Sat Oct 24 23:23:56 2020 -0400

    Update lyx-build script
---
 development/tools/lyx-build |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/development/tools/lyx-build b/development/tools/lyx-build
index 853f0b9..1c61b2f 100755
--- a/development/tools/lyx-build
+++ b/development/tools/lyx-build
@@ -49,7 +49,8 @@ shift $(($OPTIND - 1));
 
 # Determine LyX version
 cd $SRCDIR/
-VERSION=$(head configure.ac | grep AC_INIT | perl -e 'while (<>) {m/AC_INIT\(LyX,([^,]+)/; print $1;}');
+VERSION=$(head configure.ac | grep AC_INIT | \
+	perl -e 'while (<>) {m/AC_INIT\(\[LyX\],\[([^,]+)\]/; print $1;}');
 
 # Development release?
 DEVEL_RELEASE="";
@@ -61,7 +62,7 @@ if [ "$VERSION" != "$PKG_VERSION" ]; then
 	CURHASH=$(git rev-parse HEAD);
 	# Eight chars should be enough
 	CURHASH=${CURHASH:0:8};
-	# New version is e.g. 2.3.4-12649348
+	# New version is e.g. 2.3.4dev-12649348
 	PKG_VERSION="$VERSION-$CURHASH";
 	PATCH="";
 fi
@@ -81,7 +82,7 @@ $DEBUG cd "$BASE/lyx-build/";
 
 echo "Building distribution...";
 $DEBUG "$BASE/lyx-export/configure" --enable-build-type=rel --enable-qt5
-if ! $DEBUG make lyxdist; then
+if ! $DEBUG make dist; then
   echo "Couldn't make distribution!";
   exit 1;
 fi


More information about the lyx-cvs mailing list