mirror of
https://github.com/OpenVPN/openvpn.git
synced 2024-09-19 19:42:30 +02:00
Another fix related to unit test framework
Continuing to fix breakage caused by commit 40cb4cfc5d
.
It seems it was a conflict in vendor/Makefile.am's distdir target,
confusing autotools so it wouldn't actually parse that directory
properly. The result was that 'make distcheck' would fail and
tarballs created would just ship with an empty vendor/ directory.
Also remove the 'foreign' AUTOMAKE_OPTIONS flag, as we don't use
that many places at all. Things work well without this flag.
The comment had to be moved to a single line, otherwise the
white spaces between the end of the variable assignment and the
hash character got added to the variable.
[v3 - Further improve white space issues, now 'make clean'
should work too]
[v2 - Fix white space issues in path variables]
Signed-off-by: David Sommerseth <dazo@privateinternetaccess.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <1464976163-6162-1-git-send-email-openvpn@sf.lists.topphemmelig.net>
URL: http://article.gmane.org/gmane.network.openvpn.devel/11778
This commit is contained in:
parent
fdc24f1e98
commit
41ab12f062
22
vendor/Makefile.am
vendored
22
vendor/Makefile.am
vendored
@ -1,21 +1,17 @@
|
||||
AUTOMAKE_OPTIONS = foreign
|
||||
|
||||
cmockasrc = @VENDOR_SRC_ROOT@/cmocka # needs an absolute path bc. of the cmake invocation
|
||||
cmockabuild = @VENDOR_BUILD_ROOT@/cmocka
|
||||
cmockainstall = @VENDOR_DIST_ROOT@
|
||||
# needs an absolute path bc. of the cmake invocation
|
||||
cmockasrc = "@VENDOR_SRC_ROOT@/cmocka"
|
||||
cmockabuild = "@VENDOR_BUILD_ROOT@/cmocka"
|
||||
cmockainstall = "@VENDOR_DIST_ROOT@"
|
||||
|
||||
MAINTAINERCLEANFILES = \
|
||||
$(srcdir)/Makefile.in \
|
||||
$(cmockabuild) \
|
||||
$(cmockainstall) \
|
||||
@VENDOR_BUILD_ROOT@
|
||||
"$(cmockabuild)" \
|
||||
"$(cmockainstall)" \
|
||||
"@VENDOR_BUILD_ROOT@"
|
||||
|
||||
distdir:
|
||||
mkdir -p $(cmockainstall)
|
||||
|
||||
libcmocka: distdir
|
||||
mkdir -p $(cmockabuild)
|
||||
libcmocka:
|
||||
if CMOCKA_INITIALIZED
|
||||
mkdir -p $(cmockabuild) $(cmockainstall)
|
||||
(cd $(cmockabuild) && cmake -DCMAKE_INSTALL_PREFIX=$(cmockainstall) $(cmockasrc) && make && make install)
|
||||
endif
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user