diff options
author | Jörg Frings-Fürst <debian@jff.email> | 2020-04-10 23:10:07 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff.email> | 2020-04-10 23:10:07 +0200 |
commit | 4f3065b441a19ac8661a487a1f87c25d7173ac03 (patch) | |
tree | ccf4fa15d6322e1c080d29500261cc7dc0be042a /vendor/Makefile.am | |
parent | a351f71e82badcc71a2ce881bbb97eccfcebc06b (diff) | |
parent | 8a3450ef8682b9085637d7b94afc5c7e6f92e64b (diff) |
Update upstream source from tag 'upstream/2.4.8'
Update to upstream version '2.4.8'
with Debian dir 00c9c7e7fdd8b0a1729f9102507c151f67ca8c5d
Diffstat (limited to 'vendor/Makefile.am')
-rw-r--r-- | vendor/Makefile.am | 16 |
1 files changed, 8 insertions, 8 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 |