This patch seems to do what it promises, so a feature-ACK from me.
--
Samuli Seppänen
Community Manager
OpenVPN Technologies, Inc
irc freenode net: mattock
From: David Sommerseth <d...@privateinternetaccess.com>
Continuing to fix breakage caused by commit 40cb4cfc5d011102.
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.
Signed-off-by: David Sommerseth <d...@privateinternetaccess.com>
---
vendor/Makefile.am | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/vendor/Makefile.am b/vendor/Makefile.am
index 84656a1..6c925b0 100644
--- a/vendor/Makefile.am
+++ b/vendor/Makefile.am
@@ -1,5 +1,3 @@
-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@
@@ -10,12 +8,9 @@ MAINTAINERCLEANFILES = \
$(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
