From ab3bf63b75173ebf0fa3de6361ad4ae27f154894 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Sun, 17 Jan 2016 12:14:38 -0800 Subject: build: support out-of-tree builds better This adjusts the invocation of do_m4.bash to take two parameters, the m4 generator and the destination location. Doing so permits an out-of-tree build of paludis when the .m4 files are adjusted and the build needs to re-run the m4 files. While in the area, fix up a tiny bug with the generation of comparison_policy.hh. --- autotools_prepare.bash | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'autotools_prepare.bash') diff --git a/autotools_prepare.bash b/autotools_prepare.bash index 642c44723..8af91e940 100755 --- a/autotools_prepare.bash +++ b/autotools_prepare.bash @@ -9,9 +9,9 @@ fi trap 'echo "exiting." ; exit 250' 15 KILL_PID=$$ -misc/do_m4.bash paludis/Makefile.am || exit $? -misc/do_m4.bash paludis/paludis.hh || exit $? -misc/do_m4.bash paludis/util/util.hh || exit $? -misc/do_m4.bash paludis/util/Makefile.am || exit $? -misc/do_m4.bash hooks/Makefile.am || exit $? +misc/do_m4.bash paludis/Makefile.am.m4 paludis/Makefile.am || exit $? +misc/do_m4.bash paludis/paludis.hh.m4 paludis/paludis.hh || exit $? +misc/do_m4.bash paludis/util/util.hh.m4 paludis/util/util.hh || exit $? +misc/do_m4.bash paludis/util/Makefile.am.m4 paludis/util/Makefile.am || exit $? +misc/do_m4.bash hooks/Makefile.am.m4 hooks/Makefile.am || exit $? -- cgit v1.2.3