Changeset 1342

Timestamp:

Feb 14, 2011, 2:52:23 AM (12 years ago)

Author:

Peter Johansson

Message:

update macros from yat

Location:

trunk/m4

Files:

• yat_am_macros.m4 (modified) (3 diffs)
• yat_svn_release.m4 (modified) (2 diffs)

trunk/m4/yat_am_macros.m4

@@ -1 @@
-## $Id: yat_am_macros.m4 2425 2011-02-12 23:54:53Z peter $
-
-# serial 1 (yat 0.8)
+## $Id: yat_am_macros.m4 2427 2011-02-13 17:56:00Z peter $
+
+# serial 2 (yat 0.8)
 
 m4_define([yat_am_macros_copyright], [
@@ -102 +102 @@
 dnl write rules to create .revision
 _YAT_AC_APPEND_TO_FILE(YAT_AM_FILE,
-EXTRA_DIST += yat_svn_revision_FILE
+EXTRA_DIST += $(srcdir)/yat_svn_revision_FILE
 if HAVE_SVN_WC
 YAT_SVN_REVISION_FORCE:
@@ -193 +193 @@
 _YAT_AM_TOP([svn_release_year.am])
 _YAT_AC_APPEND_TO_FILE([svn_release_year.am],
-EXTRA_DIST += .release_year
+EXTRA_DIST += $(srcdir)/.release_year
 CONFIG_STATUS_DEPENDENCIES += $(srcdir)/.release_year
 RELEASE_YEAR_FORCE:

trunk/m4/yat_svn_release.m4

@@ -1 @@
-## $Id: yat_svn_release.m4 2425 2011-02-12 23:54:53Z peter $
+## $Id: yat_svn_release.m4 2428 2011-02-14 01:40:10Z peter $
 
-# serial 5 (yat 0.8)
+# serial 6 (yat 0.8)
 
 # SYNOPSIS
@@ -94 +94 @@
 
 mc_exportdir=_exported
+mc_builddir=_exported_build
 
 maintainer-check:
   rm -rf \$(mc_exportdir)
+  rm -rf \$(mc_builddir)
   svn export \$(srcdir) \$(mc_exportdir)
-  mkdir \$(mc_exportdir)/_build
+  mkdir \$(mc_builddir)
   @cd \$(mc_exportdir) \\
   && echo \"./bootstrap\" \\
   && ./bootstrap \\
-  && cd _build \\
-  && ../configure --srcdir=.. \$(DISTCHECK_CONFIGURE_FLAGS) \\
+  && cd ../\$(mc_builddir) \\
+  && ../\$(mc_exportdir)/configure --srcdir=../\$(mc_exportdir) \\
+     \$(DISTCHECK_CONFIGURE_FLAGS) \\
   && ( test -z \"\$(MAINTAINER_CHECK_LOCAL)\" || \\
         \$(MAKE) \$(AM_MAKEFLAGS) \$(MAINTAINER_CHECK_LOCAL) ) \\
-  && \$(MAKE) \$(AM_MAKEFLAGS) dist \\
-  && rm -rf \$(mc_exportdir)
+  && \$(MAKE) \$(AM_MAKEFLAGS) dist || exit 1
+  rm -rf \$(mc_builddir) \$(mc_exportdir)
 
 release: all