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.
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 <d...@privateinternetaccess.com>
---
vendor/Makefile.am | 22 +++++++++-------------
1 file changed, 9 insertions(+), 13 deletions(-)
diff --git a/vendor/Makefile.am b/vendor/Makefile.am
index 84656a1..674784a 100644
--- a/vendor/Makefile.am
+++ b/vendor/Makefile.am
@@ -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@
-
-distdir:
- mkdir -p $(cmockainstall)
+ "$(cmockabuild)" \
+ "$(cmockainstall)" \
+ "@VENDOR_BUILD_ROOT@"
-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
--
1.8.3.1
