From ca228dde46275be7ac6169eaded97f892543dae4 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Mon, 13 Jan 2003 14:22:24 +0000 Subject: [PATCH] * lib/am/distdir.am (distcheck): '=' is not valid in DOS filenames. Use '_build' and '_inst' instead of '=build' and '=inst'. * tests/man2.test: Reflect change automake: check for files in '_build' and '_inst' directories instead of '=build' and '=inst'. --- ChangeLog | 7 +++++++ lib/am/distdir.am | 8 ++++---- tests/man2.test | 16 ++++++++-------- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 937b5652..59059976 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2003-01-13 Richard Dawe (tiny change) + + * lib/am/distdir.am (distcheck): '=' is not valid in DOS filenames. + Use '_build' and '_inst' instead of '=build' and '=inst'. + * tests/man2.test: Reflect change automake: check for files in + '_build' and '_inst' directories instead of '=build' and '=inst'. + 2003-01-13 Alexandre Duret-Lutz Use `_dirstamp' when the file-system doesn't support `.dirstamp'. diff --git a/lib/am/distdir.am b/lib/am/distdir.am index 67f3f59a..bc503147 100644 --- a/lib/am/distdir.am +++ b/lib/am/distdir.am @@ -299,17 +299,17 @@ distcheck: dist ## this case. However, make the top-level directory writable so we ## can make our new subdirs. chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/=build - mkdir $(distdir)/=inst + mkdir $(distdir)/_build + mkdir $(distdir)/_inst ## Undo the write access. chmod a-w $(distdir) - dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \ + dc_install_base=`$(am__cd) $(distdir)/_inst && pwd` \ ## We will attemp a DESTDIR install in $dc_destdir. We don't ## create this directory under $dc_install_base, because it would ## create very long directory names. && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ ?DISTCHECK-HOOK? && $(MAKE) $(AM_MAKEFLAGS) distcheck-hook \ - && cd $(distdir)/=build \ + && cd $(distdir)/_build \ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ ?GETTEXT? --with-included-gettext \ ## Additional flags for configure. Keep this last in the configure diff --git a/tests/man2.test b/tests/man2.test index eba1bee6..e1109840 100755 --- a/tests/man2.test +++ b/tests/man2.test @@ -42,14 +42,14 @@ $AUTOMAKE # Let's play with $DESTDIR too, it shouldn't hurt. ./configure --prefix='' -DESTDIR="`pwd`/=inst" $MAKE -e install +DESTDIR="`pwd`/_inst" $MAKE -e install -test -f ./=inst/man/man2/foo.2 -test -f ./=inst/man/man4/foo.4 -test -f ./=inst/man/man4/bar.4 +test -f ./_inst/man/man2/foo.2 +test -f ./_inst/man/man4/foo.4 +test -f ./_inst/man/man4/bar.4 -DESTDIR="`pwd`/=inst" $MAKE -e uninstall +DESTDIR="`pwd`/_inst" $MAKE -e uninstall -test ! -f ./=inst/man/man2/foo.2 -test ! -f ./=inst/man/man4/foo.4 -test ! -f ./=inst/man/man4/bar.4 +test ! -f ./_inst/man/man2/foo.2 +test ! -f ./_inst/man/man4/foo.4 +test ! -f ./_inst/man/man4/bar.4 -- 2.43.5