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.in | |
| 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.in')
| -rw-r--r-- | vendor/Makefile.in | 19 |
1 files changed, 7 insertions, 12 deletions
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 |