diff options
| author | John Wiegley <johnw@newartisans.com> | 2009-03-07 04:14:11 -0400 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2009-03-07 04:14:11 -0400 |
| commit | 70b1c21603a84876016e70457fe92c1b57be7851 (patch) | |
| tree | 464c6eece5e840209a8202c334554a80ba64df95 | |
| parent | 5ce7755f305bb7d72a99432fc50b86d06b5067bc (diff) | |
| download | fork-ledger-70b1c21603a84876016e70457fe92c1b57be7851.tar.gz fork-ledger-70b1c21603a84876016e70457fe92c1b57be7851.tar.bz2 fork-ledger-70b1c21603a84876016e70457fe92c1b57be7851.zip | |
make release-distcheck works again
| -rw-r--r-- | Makefile.am | 9 | ||||
| -rwxr-xr-x | acprep | 2 | ||||
| -rwxr-xr-x | autogen.sh (renamed from tools/autogen.sh) | 0 | ||||
| -rwxr-xr-x | tools/pre-commit | 7 |
4 files changed, 12 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index 23cef480..4669d8d1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,7 @@ VERSION = 3.0 ACLOCAL_AMFLAGS = -I m4 dist_man_MANS = doc/ledger.1 SUBDIRS = po intl -EXTRA_DIST = config.rpath contrib +EXTRA_DIST = autogen.sh config.rpath contrib lib_LTLIBRARIES = \ libledger_report.la \ @@ -418,7 +418,7 @@ fullcheck: cppunittests ###################################################################### -EXTRA_DIST += doc/LICENSE doc/NEWS +EXTRA_DIST += doc/README doc/LICENSE doc/NEWS EXTRA_DIST += doc/Doxyfile doc/ledger.pdf doc/refman.pdf DISTCLEANFILES += doc/ledger.info doc/ledger.pdf \ @@ -434,7 +434,6 @@ dist-hook: cp -pR doc/html $(distdir)/doc rm -f $(distdir)/README.textile cp -p $(srcdir)/doc/README $(distdir)/README - cp -p $(srcdir)/tools/autogen.sh $(distdir)/autogen.sh distclean-local: rm -fr doc/html doc/latex @@ -498,11 +497,11 @@ copy-sources: release: copy-sources (cd $(STAGING); \ - nice -n 20 ./acprep --release --opt --build -j3 clean all) + nice -n 20 ./acprep --release --opt --build -j3) release-distcheck: copy-sources (cd $(STAGING); \ - nice -n 20 ./acprep --release --build -j3 clean distcheck) + nice -n 20 ./acprep --release --build -j3 distcheck) benchmark: release PATH=$(PATH):$(srcdir)/tools \ @@ -23,7 +23,7 @@ then echo "m4_define([VERSION_NUMBER], [$COMMIT])" > version.m4 - sh tools/autogen.sh + sh autogen.sh # configure the template files if [ ! -f po/Makevars ]; then diff --git a/tools/autogen.sh b/autogen.sh index a8b63eff..a8b63eff 100755 --- a/tools/autogen.sh +++ b/autogen.sh diff --git a/tools/pre-commit b/tools/pre-commit index b171a83b..3508958d 100755 --- a/tools/pre-commit +++ b/tools/pre-commit @@ -2,6 +2,13 @@ "$(tg --hooks-path)"/pre-commit "$@" || exit $? +if echo $(git rev-parse --symbolic-full-name HEAD) | grep -q ^refs/heads/t/; then + exit 0 +fi +if [ $(git rev-parse --symbolic-full-name HEAD) = refs/heads/test ]; then + exit 0 +fi + # These are the locations I keep my temporary source and build trees in TMPDIR=$HOME/Products/ledger-pre-commit MIRROR=$HOME/Products/ledger-pre-commit-mirror |