Skip to content
Snippets Groups Projects
Commit c89e5ae2 authored by Klaus Rabbertz's avatar Klaus Rabbertz
Browse files

Adapt autotools setup to git

parent 03297fad
Branches
Tags 2450
No related merge requests found
......@@ -15,13 +15,13 @@ SUBDIRS = data doc fastnlotoolkit src pyext check fortranext
# Provide local m4 macros in dir m4, copy also system-wide macros
ACLOCAL_AMFLAGS = -I m4 --install
# Add subversion revision number, recipe from Autotools by J. Calcote
EXTRA_DIST = m4 SVNREV
# Add git equivalent of subversion revision number (original svn recipe from Autotools by J. Calcote).
EXTRA_DIST = m4 GITREV
# This gives e.g. fastnlo-2.0.0-643M for svn revision 643 locally modified
distdir = $(PACKAGE)-$(VERSION)-$(SVNREV)
# Don't put .svn subdirs into distribution package
distdir = $(PACKAGE)-$(VERSION)-$(GITREV)
# Don't put .git subdirs into distribution package
dist-hook:
rm -rf `find $(distdir) -name .svn`
rm -rf `find $(distdir) -name .git`
# Installation of DOXYGEN documentation
# Docu is not remade anymore at each occasion!
......@@ -70,4 +70,4 @@ endif HAVE_DOXYGEN
MAINTAINERCLEANFILES = INSTALL config.h.in config.guess config.sub configure Makefile.in \
depcomp install-sh ltmain.sh missing compile \
aclocal.m4 m4/libtool.m4 m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4 m4/lt~obsolete.m4 \
SVNREV py-compile test-driver
GITREV py-compile test-driver
......@@ -561,12 +561,16 @@ AM_CONDITIONAL(ENABLE_PYEXT, [test "x$enable_pyext" = "xyes"])
# Add subversion revision number, recipe from Autotools by J. Calcote
# Modified on 18.12.13 to fix changed behaviour of svnversion to give "Unversioned directory" instead of "exported"
SVNREV=`( svnversion $srcdir | sed 's/:.*//' ) 2>/dev/null`
if { ! ( svnversion ) >/dev/null 2>&1 || test "x$SVNREV" = "xexported" || test "x$SVNREV" = "xUnversioned directory"; } ;
then SVNREV=`cat $srcdir/SVNREV`
else echo $SVNREV>$srcdir/SVNREV
fi
AC_SUBST(SVNREV)
#SVNREV=`( svnversion $srcdir | sed 's/:.*//' ) 2>/dev/null`
#if { ! ( svnversion ) >/dev/null 2>&1 || test "x$SVNREV" = "xexported" || test "x$SVNREV" = "xUnversioned directory"; } ;
# then SVNREV=`cat $srcdir/SVNREV`
# else echo $SVNREV>$srcdir/SVNREV
#fi
#AC_SUBST(SVNREV)
GITREV=`git describe`
echo $GITREV>$srcdir/GITREV
AC_SUBST(GITREV)
# Initialize Doxygen doc
if test "x$DOXYGEN" != "x"; then
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment