diff --git a/configure.ac b/configure.ac index 7d28f07..757133a 100644 --- a/configure.ac +++ b/configure.ac @@ -29,7 +29,7 @@ AH_TEMPLATE([REQ_SERVER_CERT], [Defined if client requires server SSL certificat AH_TEMPLATE([TRUST_UDS_CRED], [Defined if we trust credentials from UDS client]) dnl ### Normal initialization. ###################################### -AC_INIT([conserver],m4_esyscmd_s([./package/get-version number])) +AC_INIT([conserver],m4_esyscmd_s([./gen-version number])) AC_PREREQ(2.59) AC_CONFIG_SRCDIR([conserver/main.c]) AC_CONFIG_HEADER(config.h) @@ -43,8 +43,8 @@ fi MKDIR="mkdir -p -m 755" AC_SUBST(MKDIR) -AC_SUBST(CONSERVER_VERSION, m4_esyscmd_s([./package/get-version number])) -AC_SUBST(CONSERVER_DATE, m4_esyscmd_s([./package/get-version date])) +AC_SUBST(CONSERVER_VERSION, m4_esyscmd_s([./gen-version number])) +AC_SUBST(CONSERVER_DATE, m4_esyscmd_s([./gen-version date])) dnl ### Custom settings. ############################################ diff --git a/package/get-version b/gen-version similarity index 100% rename from package/get-version rename to gen-version diff --git a/package/create-changes b/package/create-changes index 1b35562..a981db4 100755 --- a/package/create-changes +++ b/package/create-changes @@ -4,7 +4,7 @@ set -e [ -z "$1" ] && echo "Usage: $0 tag" && exit 1 range="$1" -date=`./package/get-version date` +date=`./gen-version date` changedate=`date -j -f '%Y/%m/%d' "$date" '+%B %-d, %Y'` -echo "version `./package/get-version number` ($changedate):" +echo "version `./gen-version number` ($changedate):" git log --no-merges --pretty=tformat:' - %s (%an <%ae>)' "$range" | tail -r | awk '{if (! l[$0]) {l[$0]++; print}}' | sed -e 's/ *(Bryan Stansell )$//' diff --git a/package/make-and-stage-release b/package/make-and-stage-release index a3e28bd..b241bad 100755 --- a/package/make-and-stage-release +++ b/package/make-and-stage-release @@ -6,7 +6,7 @@ local=false && [ "$1" = "local" ] && local=true [ -f conserver/version.h ] || { echo "you are in the wrong place" ; exit 1; } -ver=`./package/get-version number` +ver=`./gen-version number` if ! $local; then echo "Ready to tag release v$ver (y/N)?"