diff --git a/Makefile.am b/Makefile.am index e0cdb29a21..7427129687 100644 --- a/Makefile.am +++ b/Makefile.am @@ -89,7 +89,7 @@ EXTRA_DIST = \ intltool-extract.in \ intltool-merge.in \ intltool-update.in \ - util/gnc-scm-info + util/gnc-vcs-info ## We borrow guile's convention and use @-...-@ as the substitution ## brackets here, instead of the usual @...@. This prevents autoconf diff --git a/configure.ac b/configure.ac index 1551f1e757..87ee5c5ab7 100644 --- a/configure.ac +++ b/configure.ac @@ -197,10 +197,10 @@ CFLAGS="${cflags_save}" # test whether we are building directly from svn/svk/git/bzr AC_MSG_CHECKING(if building from an scm managed directory) -"$srcdir/util/gnc-scm-info" -r "$srcdir" >/dev/null 2>&1 +"$srcdir/util/gnc-vcs-info" -r "$srcdir" >/dev/null 2>&1 if test $? = 0 -o "x${BUILDING_FROM_VCS}" = "xyes" ; then BUILDING_FROM_VCS=yes - SCM_TYPE=$("$srcdir/util/gnc-scm-info" -t "$srcdir") + SCM_TYPE=$("$srcdir/util/gnc-vcs-info" -t "$srcdir") AC_MSG_RESULT($SCM_TYPE) if test "x${SCM_TYPE}" = "xgit"; then @@ -218,23 +218,23 @@ else BUILDING_FROM_VCS=no SCM_TYPE= - # Make sure we've got swig-runtime.h and gnc-scm-info.h + # Make sure we've got swig-runtime.h and gnc-vcs-info.h AC_CHECK_FILE(${srcdir}/src/swig-runtime.h, [], [AC_MSG_ERROR([ It looks like you are NOT building from Subversion, svk, git or bzr but I cannot find swig-runtime.h. Check your PATH and make sure -we can find gnc-scm-info in your PATH! +we can find gnc-vcs-info in your PATH! Either that or contact gnucash-devel@gnucash.org because the tarball you downloaded is broken. ])]) - AC_CHECK_FILE(${srcdir}/src/core-utils/gnc-scm-info.h, [], + AC_CHECK_FILE(${srcdir}/src/core-utils/gnc-vcs-info.h, [], [AC_MSG_ERROR([ It looks like you are NOT building from Subversion, svk, git or bzr -but I cannot find gnc-scm-info.h. Check your PATH and make sure -we can find gnc-scm-info in your PATH! +but I cannot find gnc-vcs-info.h. Check your PATH and make sure +we can find gnc-vcs-info in your PATH! Either that or contact gnucash-devel@gnucash.org because the tarball you downloaded is broken. diff --git a/src/core-utils/Makefile.am b/src/core-utils/Makefile.am index 84acca94e9..e207dffe05 100644 --- a/src/core-utils/Makefile.am +++ b/src/core-utils/Makefile.am @@ -130,7 +130,7 @@ endif noinst_DATA = .scm-links BUILT_SOURCES = gncla-dir.h gnc-version.h -EXTRA_DIST = $(gncscmmod_DATA) core-utils.i gncla-dir.h.in gnc-scm-info.h +EXTRA_DIST = $(gncscmmod_DATA) core-utils.i gncla-dir.h.in gnc-vcs-info.h clean-local: rm -rf gnucash @@ -160,37 +160,37 @@ gnc-version.h: _gnc-version.h -cmp -s _gnc-version.h gnc-version.h || cp _gnc-version.h gnc-version.h -rm -f _gnc-version.h -_gnc-version.h: gnc-scm-info.h Makefile +_gnc-version.h: gnc-vcs-info.h Makefile @echo "/* Autogenerated. Do not change. */" > _gnc-version.h @echo "#ifndef GNC_VERSION_H" >> _gnc-version.h @echo "#define GNC_VERSION_H" >> _gnc-version.h @echo "" >> _gnc-version.h - @scm_info=`${top_srcdir}/util/gnc-scm-info -t ${top_srcdir}` ; \ + @scm_info=`${top_srcdir}/util/gnc-vcs-info -t ${top_srcdir}` ; \ if [ $$? = 0 ] ; then \ echo "#define GNUCASH_SCM \"$$scm_info\"" >> _gnc-version.h ; \ fi @echo "#define GNUCASH_BUILD_DATE \"`date +%Y-%m-%d`\"" >> _gnc-version.h - @echo "#include \"gnc-scm-info.h\"" >> _gnc-version.h + @echo "#include \"gnc-vcs-info.h\"" >> _gnc-version.h @echo "#endif" >> _gnc-version.h -gnc-scm-info.h: _gnc-scm-info.h - -if [ ! -f gnc-scm-info.h ]; then cp _gnc-scm-info.h gnc-scm-info.h; fi - -cmp -s _gnc-scm-info.h gnc-scm-info.h || cp _gnc-scm-info.h gnc-scm-info.h - -rm -f _gnc-scm-info.h +gnc-vcs-info.h: _gnc-vcs-info.h + -if [ ! -f gnc-vcs-info.h ]; then cp _gnc-vcs-info.h gnc-vcs-info.h; fi + -cmp -s _gnc-vcs-info.h gnc-vcs-info.h || cp _gnc-vcs-info.h gnc-vcs-info.h + -rm -f _gnc-vcs-info.h -_gnc-scm-info.h: Makefile - @scm_info=`${top_srcdir}/util/gnc-scm-info -r ${top_srcdir}` ; \ +_gnc-vcs-info.h: Makefile + @scm_info=`${top_srcdir}/util/gnc-vcs-info -r ${top_srcdir}` ; \ if [ $$? = 0 ] ; then \ if [ -z "$$scm_info" ] ; then \ - echo "gnc-scm-info failed. figure out why." ; \ + echo "gnc-vcs-info failed. figure out why." ; \ echo "can't determine svn/svk/git/bzr revision from ${top_srcdir}." ; \ exit 1 ; \ fi ; \ - echo "/* Autogenerated. Do not change. */" > _gnc-scm-info.h ; \ - echo "#define GNUCASH_SCM_REV \"$$scm_info\"" >> _gnc-scm-info.h ; \ + echo "/* Autogenerated. Do not change. */" > _gnc-vcs-info.h ; \ + echo "#define GNUCASH_SCM_REV \"$$scm_info\"" >> _gnc-vcs-info.h ; \ else \ - if [ -r $(srcdir)/gnc-scm-info.h ] ; then \ - cp $(srcdir)/gnc-scm-info.h _gnc-scm-info.h ; \ + if [ -r $(srcdir)/gnc-vcs-info.h ] ; then \ + cp $(srcdir)/gnc-vcs-info.h _gnc-vcs-info.h ; \ else \ echo "You're building from svn/svk/git/bzr... But your build system is broken" ; \ echo "Don't do that. Complain to your build-system creator." ; \ diff --git a/util/gnc-scm-info b/util/gnc-vcs-info similarity index 100% rename from util/gnc-scm-info rename to util/gnc-vcs-info