diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2014-02-27 11:40:32 +0100 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2014-02-27 12:02:13 +0100 |
| commit | bd1c9f1eacf000587b41e29666b7b64d459509e3 (patch) | |
| tree | 58b1df705e1bd2c5dfefb771f115a978fbd802f4 /conf | |
| parent | 2ed241aeb3329f661bb3898ed8d5d579bedd3b8f (diff) | |
| download | strongswan-bd1c9f1eacf000587b41e29666b7b64d459509e3.tar.bz2 strongswan-bd1c9f1eacf000587b41e29666b7b64d459509e3.tar.xz | |
conf: Fix out-of-tree build from distribution
It worked from the repository, where strongswan.conf.5.main is generated
in the build dir, but not from the distribution where it is located in
the source dir, so explicitly create it in the source dir.
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/Makefile.am | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/conf/Makefile.am b/conf/Makefile.am index f0212c132..61a0add4d 100644 --- a/conf/Makefile.am +++ b/conf/Makefile.am @@ -93,8 +93,6 @@ plugins_install_src = $(charon_plugins:%=plugins/%.conf) # has to be defined via autoconf as we can't do it with automake conditionals options_install_src = $(strongswan_options:%=options/%.conf) -manparts = strongswan.conf.5.head strongswan.conf.5.main strongswan.conf.5.tail - templates_DATA = strongswan.conf optionstemplate_DATA = $(options_install_src) pluginstemplate_DATA = $(plugins_install_src) @@ -136,12 +134,11 @@ $(plugins_install_tmp): strongswan.conf.5.main: $(alloptions) $(AM_V_GEN) \ - (cd $(srcdir) && \ - $(PYTHON) format-options.py -f man $(alloptions)) > $@ + cd $(srcdir) && $(PYTHON) format-options.py -f man $(alloptions) > $@ -strongswan.conf.5: $(manparts) +strongswan.conf.5: strongswan.conf.5.head strongswan.conf.5.main strongswan.conf.5.tail $(AM_V_GEN) \ - cat $(manparts) > $@ + cat strongswan.conf.5.head $(srcdir)/strongswan.conf.5.main strongswan.conf.5.tail > $@ clean-local: rm -f plugins/*.conf plugins/*.tmp |