summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.m41
-rw-r--r--defs.m41
-rw-r--r--dss.suite.m44
-rw-r--r--index.html.m45
-rwxr-xr-xversion-gen.sh8
5 files changed, 3 insertions, 16 deletions
diff --git a/README.m4 b/README.m4
index 2a716f1..9a2e070 100644
--- a/README.m4
+++ b/README.m4
@@ -11,6 +11,5 @@ Resources
~~~~~~~~~
project web page: PACKAGE_HOMEPAGE()
git clone CLONE_URL()
-gitweb: GITWEB_URL()
author home page: HOME_URL()
report bugs to: AUTHOR() <EMAIL()>
diff --git a/defs.m4 b/defs.m4
index da2ad92..ce0a066 100644
--- a/defs.m4
+++ b/defs.m4
@@ -6,7 +6,6 @@ define(«AUTHOR», «Andre Noll»)
define(«EMAIL», «maan@tuebingen.mpg.de»)
define(«URL», «https://people.tuebingen.mpg.de/maan/PACKAGE()/»)
define(«CLONE_URL», «https://git.tuebingen.mpg.de/PACKAGE()»)
-define(«GITWEB_URL», «https://git.tuebingen.mpg.de/PACKAGE().git»)
define(«PACKAGE_HOMEPAGE», «https://people.tuebingen.mpg.de/maan/PACKAGE()/»)
define(«HOME_URL», «https://people.tuebingen.mpg.de/maan/»)
define(«LICENSE», «GPL-2.0»)
diff --git a/dss.suite.m4 b/dss.suite.m4
index 3fe3122..8be6a3a 100644
--- a/dss.suite.m4
+++ b/dss.suite.m4
@@ -664,10 +664,6 @@ caption = Subcommands
.UR CLONE_URL()
.UE
.br
- Gitweb:
- .UR GITWEB_URL()
- .UE
- .br
Author's home page:
.UR HOME_URL()
.UE
diff --git a/index.html.m4 b/index.html.m4
index 849e203..6e15625 100644
--- a/index.html.m4
+++ b/index.html.m4
@@ -44,9 +44,7 @@ dnl SPDX-License-Identifier: GPL-2.0
<p> To install from source, you first need to install the dependencies:
<code>apt-get install gcc rsync liblopsub-dev m4</code>. </p>
- <p> To download the source code, run <code>git clone
- CLONE_URL()</code>, or grab a current tarball from the <a
- href="GITWEB_URL()">gitweb page</a> and unpack it. </p>
+ <p> To download the source code, run <code>git clone CLONE_URL()</code>. </p>
<p> To build the PACKAGE() executable and the man page, enter the
PACKAGE() source directory and type <code>make</code>. To install
@@ -61,7 +59,6 @@ dnl SPDX-License-Identifier: GPL-2.0
<ul>
<li> <a href="PACKAGE_HOMEPAGE()">PACKAGE() home page</a> </li>
<li> <code>git clone CLONE_URL()</code> </li>
- <li> <a href="GITWEB_URL()">Gitweb</a> </li>
<li> <a href="HOME_URL()">Author home page</a> </li>
<li> <a href="PACKAGE().1.html">manual page</a> </li>
<li> Contact: <a href="mailto:EMAIL()">AUTHOR() &lt;EMAIL()&gt;</a> </li>
diff --git a/version-gen.sh b/version-gen.sh
index ba4af3e..a6cc042 100755
--- a/version-gen.sh
+++ b/version-gen.sh
@@ -6,7 +6,6 @@ package="$1"
version_file="$2"
ver='unnamed_version'
-# First try git, then gitweb, then default.
if [ -e '.git' -o -e '../.git' ]; then
git_ver=$(git describe --abbrev=4 --always HEAD 2>/dev/null)
[ -z "$git_ver" ] && git_ver="$ver"
@@ -14,13 +13,10 @@ if [ -e '.git' -o -e '../.git' ]; then
git update-index -q --refresh > /dev/null
# if there are differences (exit code 1), the working tree is dirty
git diff-index --quiet HEAD || git_ver=$git_ver-dirty
- ver=$git_ver
-elif [ "${PWD%%-*}" = $package- ]; then
- ver=${PWD##*/$package-}
+ ver=${git_ver#v}
fi
-ver=${ver#v}
-echo "$ver"
+printf '%s\n' "$ver"
[ -z "${version_file}" ] && exit 0
# update version file if necessary
content="const char *${package}_version(void) {return \"$ver\";};"