summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2020-04-10 23:09:59 +0200
committerJörg Frings-Fürst <debian@jff.email>2020-04-10 23:09:59 +0200
commit8a3450ef8682b9085637d7b94afc5c7e6f92e64b (patch)
tree6b67e6d6830091ed26761480ba67d97680f4e3aa /vendor
parent87356242baf10c8b2a94d9013e436ed2a0dada53 (diff)
New upstream version 2.4.8upstream/2.4.8
Diffstat (limited to 'vendor')
-rw-r--r--vendor/Makefile.am16
-rw-r--r--vendor/Makefile.in19
2 files changed, 15 insertions, 20 deletions
diff --git a/vendor/Makefile.am b/vendor/Makefile.am
index 674784a..46072c3 100644
--- a/vendor/Makefile.am
+++ b/vendor/Makefile.am
@@ -1,18 +1,18 @@
-# needs an absolute path bc. of the cmake invocation
-cmockasrc = "@VENDOR_SRC_ROOT@/cmocka"
-cmockabuild = "@VENDOR_BUILD_ROOT@/cmocka"
-cmockainstall = "@VENDOR_DIST_ROOT@"
+cmockasrc = $(srcdir)/cmocka
+# Not just '$(builddir)/cmocka', because cmocka requires an out-of-source build
+cmockabuild = $(builddir)/cmocka_build
+cmockadist = $(builddir)/dist
MAINTAINERCLEANFILES = \
$(srcdir)/Makefile.in \
"$(cmockabuild)" \
- "$(cmockainstall)" \
- "@VENDOR_BUILD_ROOT@"
+ "$(cmockadist)"
libcmocka:
if CMOCKA_INITIALIZED
- mkdir -p $(cmockabuild) $(cmockainstall)
- (cd $(cmockabuild) && cmake -DCMAKE_INSTALL_PREFIX=$(cmockainstall) $(cmockasrc) && make && make install)
+ mkdir -p $(cmockabuild) $(cmockadist)
+ ## Compensate for the cd in the paths
+ (cd $(cmockabuild) && cmake -DCMAKE_INSTALL_PREFIX=../$(cmockadist) ../$(cmockasrc) && make && make install)
endif
check: libcmocka
diff --git a/vendor/Makefile.in b/vendor/Makefile.in
index 8173797..c59046f 100644
--- a/vendor/Makefile.in
+++ b/vendor/Makefile.in
@@ -243,9 +243,6 @@ TAP_WIN_MIN_MINOR = @TAP_WIN_MIN_MINOR@
TEST_CFLAGS = @TEST_CFLAGS@
TEST_LDFLAGS = @TEST_LDFLAGS@
TMPFILES_DIR = @TMPFILES_DIR@
-VENDOR_BUILD_ROOT = @VENDOR_BUILD_ROOT@
-VENDOR_DIST_ROOT = @VENDOR_DIST_ROOT@
-VENDOR_SRC_ROOT = @VENDOR_SRC_ROOT@
VERSION = @VERSION@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@ -305,16 +302,14 @@ tmpfilesdir = @tmpfilesdir@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-
-# needs an absolute path bc. of the cmake invocation
-cmockasrc = "@VENDOR_SRC_ROOT@/cmocka"
-cmockabuild = "@VENDOR_BUILD_ROOT@/cmocka"
-cmockainstall = "@VENDOR_DIST_ROOT@"
+cmockasrc = $(srcdir)/cmocka
+# Not just '$(builddir)/cmocka', because cmocka requires an out-of-source build
+cmockabuild = $(builddir)/cmocka_build
+cmockadist = $(builddir)/dist
MAINTAINERCLEANFILES = \
$(srcdir)/Makefile.in \
"$(cmockabuild)" \
- "$(cmockainstall)" \
- "@VENDOR_BUILD_ROOT@"
+ "$(cmockadist)"
all: all-am
@@ -511,8 +506,8 @@ uninstall-am:
libcmocka:
-@CMOCKA_INITIALIZED_TRUE@ mkdir -p $(cmockabuild) $(cmockainstall)
-@CMOCKA_INITIALIZED_TRUE@ (cd $(cmockabuild) && cmake -DCMAKE_INSTALL_PREFIX=$(cmockainstall) $(cmockasrc) && make && make install)
+@CMOCKA_INITIALIZED_TRUE@ mkdir -p $(cmockabuild) $(cmockadist)
+@CMOCKA_INITIALIZED_TRUE@ (cd $(cmockabuild) && cmake -DCMAKE_INSTALL_PREFIX=../$(cmockadist) ../$(cmockasrc) && make && make install)
check: libcmocka