From 34dbd2d49bf85d5c2293390bdd11a3a515b62bd4 Mon Sep 17 00:00:00 2001 From: Elizabeth Myers Date: Mon, 7 Mar 2016 05:15:35 -0600 Subject: [PATCH] Makefile.am: make git serno generation a little nicer. --- Makefile.am | 2 +- configure.ac | 2 +- librb/Makefile.am | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index d91467b3f..04f6b6081 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,7 +23,7 @@ BUILT_SOURCES = include/serno.h include/serno.h: @if [ -d .git ] ; then \ - revh=`git log -1 --date=short --pretty=format:%cd_%h 2>/dev/null | sed -e s/-//g -e s/_/-/`;\ + revh=`git log -1 --date=format:%Y%m%d --pretty=format:%cd-%h`;\ [ -z "$$revh" ] || echo '#define SERNO "'$$revh'"' >include/serno.h ; \ elif [ -d .hg ] ; then \ revh=`hg parents --template '{date|shortdate}_{node|short}' 2>/dev/null | sed -e s/-//g -e s/_/-/`;\ diff --git a/configure.ac b/configure.ac index b542dac65..c68be64f1 100644 --- a/configure.ac +++ b/configure.ac @@ -577,7 +577,7 @@ AC_HELP_STRING([--with-topiclen=NUMBER],[Set the max topic length to NUMBER (def AC_DEFINE_UNQUOTED(TOPICLEN, ${TOPICLEN}, [Maximum topic length (<=390)]) AC_DEFINE_UNQUOTED(NICKLEN, (${NICKLEN}+1), [Nickname length]) -# rpath, for finding libratbox.so at run time +# rpath, for finding librb.so at run time hold_ldflags=$LDFLAGS AC_MSG_CHECKING(for the ld -rpath flag) LDFLAGS="${LDFLAGS} -Wl,-rpath=${libdir}" diff --git a/librb/Makefile.am b/librb/Makefile.am index 245174b86..bcfd61553 100644 --- a/librb/Makefile.am +++ b/librb/Makefile.am @@ -9,7 +9,7 @@ BUILT_SOURCES = include/serno.h include/serno.h: @if [ -d .git ] ; then \ - revh=`git log -1 --date=short --pretty=format:%cd_%h 2>/dev/null | sed -e s/-//g -e s/_/-/`;\ + revh=`git log -1 --date=format:%Y%m%d --pretty=format:%cd-%h`;\ [ -z "$$revh" ] || echo '#define SERNO "'$$revh'"' >include/serno.h ; \ elif [ -d .hg ] ; then \ revh=`hg parents --template '{date|shortdate}_{node|short}' 2>/dev/null | sed -e s/-//g -e s/_/-/`;\