Ticket #411: z.diff

File z.diff, 1.4 KB (added by vda, 10 years ago)

Updated fix. I had to drop version.h updating from Makefiles, it does not work correctly. Previous fix was aborting because make still thinks the rule should be triggered.

  • Makefile.am

    diff --git a/Makefile.am b/Makefile.am
    index 73c15d5..f1ac021 100644
    a b EXTRA_DIST = 
    77 
    88dist_noinst_SCRIPTS = build-glib2.sh 
    99 
    10 dist_noinst_HEADERS = $(top_srcdir)/version.h 
    11  
    1210ACLOCAL_AMFLAGS = -I m4 
    13  
    14 CONFIG_STATUS_DEPENDENCIES = $(top_srcdir)/version.h 
    15  
    16 .PHONY: update-version 
    17  
    18 update-version: 
    19         @if test -x $(top_srcdir)/maint/version.sh; then \ 
    20             $(top_srcdir)/maint/version.sh "$(top_srcdir)" 2>&1 >/dev/null; \ 
    21         else \ 
    22             echo "File not found: $(top_srcdir)/maint/version.sh"; \ 
    23         fi 
    24  
    25 $(top_srcdir)/version.h: update-version 
  • autogen.sh

    diff --git a/autogen.sh b/autogen.sh
    index ffb01cf..b9174ba 100755
    a b test -f configure || \ 
    8585) || exit 1 
    8686 
    8787if test -x $srcdir/configure.mc; then 
    88   $srcdir/configure.mc "$@" 
     88  $srcdir/configure.mc "$@" || exit 1 
    8989fi 
     90 
     91maint/version.sh 
  • maint/version.sh

    diff --git a/maint/version.sh b/maint/version.sh
    index 4df9489..97bd976 100755
    a b VERSION_FILE=${src_top_dir}/version.h 
    2323 
    2424pushd ${src_top_dir} &>/dev/null 
    2525git_head=$(git rev-parse --verify HEAD 2>/dev/null) 
    26 [ -z "${git_head}" ] && exit 
     26[ -z "${git_head}" ] && echo "Must be run in the git tree" && exit 1 
    2727 
    2828new_version="$(git describe 2>/dev/null)" 
    29 [ -z "${new_version}" ] && exit 
     29[ -z "${new_version}" ] && echo "Must be run in the git tree" && exit 1 
    3030popd &>/dev/null 
    3131 
    3232