ims-volte-vowifi
/
strongswan
1
0
Fork 0
Code Pull Requests Releases Activity

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.
laforge/swu
Tobias Brunner 2014-02-27 11:40:32 +01:00
parent 2ed241aeb3
commit bd1c9f1eac
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
conf/Makefile.am
View File

@ -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