From a719c77f634cc3a18f9bca0a9bc8557464897a36 Mon Sep 17 00:00:00 2001 From: John Maddock Date: Fri, 27 Apr 2001 11:06:28 +0000 Subject: [PATCH] Fixes resulting from changed directory structure [SVN r9987] --- configure | 5 +++-- configure.in | 3 ++- makefile.in | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/configure b/configure index b660a31b..cd924e72 100644 --- a/configure +++ b/configure @@ -3773,7 +3773,7 @@ done ac_given_srcdir=$srcdir -trap 'rm -fr `echo "lib/makefile example/jgrep/makefile example/timer/makefile test/regress/makefile makefile ../../boost/regex/detail/regex_options.hpp:jm_opt.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +trap 'rm -fr `echo "build/makefile example/jgrep/makefile example/timer/makefile test/regress/makefile makefile ../../boost/regex/detail/regex_options.hpp:jm_opt.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then @@ -4063,5 +4063,6 @@ rm -f jm_opt.out + diff --git a/configure.in b/configure.in index f3c3a93d..9cd6b6ed 100644 --- a/configure.in +++ b/configure.in @@ -1657,7 +1657,7 @@ AC_DEFINE(BOOST_RE_AUTO_CONF) AC_MSG_RESULT(***) AC_MSG_RESULT($0: setting up headers...) AC_MSG_RESULT(***) -AC_OUTPUT(lib/makefile example/jgrep/makefile example/timer/makefile test/regress/makefile makefile) +AC_OUTPUT(build/makefile example/jgrep/makefile example/timer/makefile test/regress/makefile makefile) AC_MSG_RESULT(***) AC_MSG_RESULT($0: regex++ package tuned for use with \"${CXX}\" compiler.) AC_MSG_RESULT($0: To restore original settings - copy jm_opt.in to ../../boost/regex/detail/regex_options.hpp) @@ -1696,5 +1696,6 @@ rm -f jm_opt.out + diff --git a/makefile.in b/makefile.in index e9f3bc53..128a5566 100644 --- a/makefile.in +++ b/makefile.in @@ -4,7 +4,7 @@ ALL_DEP=@ac_all_dep@ base: ./build/libboost_regex.a ./build/libboost_regex.a: $(ALL_DEP) - sh dmi.sh lib + sh dmi.sh build jgrep : base @@ -26,3 +26,4 @@ all : base jgrep test timer +