aboutsummaryrefslogtreecommitdiff
path: root/hooks
diff options
context:
space:
mode:
authorAvatar Saleem Abdulrasool <compnerd@compnerd.org> 2016-01-17 12:14:38 -0800
committerAvatar Saleem Abdulrasool <compnerd@compnerd.org> 2016-01-17 12:16:56 -0800
commitab3bf63b75173ebf0fa3de6361ad4ae27f154894 (patch)
treebe45d7e5b5e57c821603a82331c2e0e576f3765b /hooks
parentcd722e33ba845a494ae19a6a45dfe4f60217a7a5 (diff)
downloadpaludis-ab3bf63b75173ebf0fa3de6361ad4ae27f154894.tar.gz
paludis-ab3bf63b75173ebf0fa3de6361ad4ae27f154894.tar.xz
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.
Diffstat (limited to 'hooks')
-rw-r--r--hooks/Makefile.am.m42
1 files changed, 1 insertions, 1 deletions
diff --git a/hooks/Makefile.am.m4 b/hooks/Makefile.am.m4
index 39b9ee693..309454413 100644
--- a/hooks/Makefile.am.m4
+++ b/hooks/Makefile.am.m4
@@ -306,7 +306,7 @@ uninstall-local :
rm -f $(DESTDIR)/$(libexecdir)/paludis/hooks/*/log.bash
Makefile.am : Makefile.am.m4
- $(top_srcdir)/misc/do_m4.bash Makefile.am
+ $(top_srcdir)/misc/do_m4.bash $(abs_srcdir)/Makefile.am.m4 $(abs_builddir)/Makefile.am
all-local :
chmod +x $(builddir)/news.hook $(builddir)/eselect_env_update.bash