X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fthirdparty%2FMakefile;h=2562727f8df90394bebcb8901fcd374af67082ed;hb=a2ebbc5e88800bd740652a32285f8145a1acfdc6;hp=905731e14cc3e551fe1892285b1dd6b5698e4e84;hpb=d034ec092c8aaf21c755bc612796df69ffdee4ac;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile
index 905731e1..2562727f 100644
--- a/cinelerra-5.1/thirdparty/Makefile
+++ b/cinelerra-5.1/thirdparty/Makefile
@@ -162,7 +162,7 @@ ffmpeg.cfg_params= \
 		$(EXTRA_LIBS)" $(FFMPEG_EXTRA_CFG) \
 
 #cmake_config=echo "exec cmake \$$$$@ $(1)" > ./configure; chmod +x ./configure;
-cmake_config=echo "exec cmake $(1) \$$$$@" > ./configure; chmod +x ./configure;
+cmake_config=echo 'cmake "$$$$@" "$(1)"' > ./configure; chmod +x ./configure;
 a52dec.mak_params?= ; cd $(call bld_path,a52dec,include); ln -sf . a52dec
 a52dec.cfg_vars?= CFLAGS+=" -U__FreeBSD__ $(call inc_path,djbfft)" LIBS+=" $(call ld_path,djbfft)"
 a52dec.cfg_params?=--enable-djbfft
@@ -185,14 +185,8 @@ libaom.cfg_vars?=$(call cmake_config,aom-master)
 libaom.cfg_params?= -DENABLE_SHARED=no -DCMAKE_INSTALL_LIBDIR=lib \
  -DCMAKE_INSTALL_PREFIX=$(call bld_path,libaom)/usr/local
 libaom.mak_params?= ; $(MAKE) -C libaom* install
-dav1d.cfg_vars?=\
- echo "meson setup . build" > configure; \
- echo "meson configure build -Denable_tools=false" >> configure; \
- echo "meson configure build --buildtype=release" >> configure; \
- echo "meson configure build --default-library=static" >> configure; \
- chmod +x ./configure;
-dav1d.mak_vars?=(echo "all:"; echo "	ninja -C build") > $(call bld_path,dav1d)/Makefile;
-dav1d.mak_params?=; cd "$(call bld_path,dav1d)"; DESTDIR="$(call bld_path,dav1d)" meson install -C build
+dav1d.cfg_vars?=echo "echo dav1d custom make" >> configure; chmod +x ./configure;
+dav1d.mak_params?=; $(MAKE) -C dav1d* install DESTDIR="$(call bld_path,dav1d)"
 libwebp.cfg_vars?= mkdir build && cd build && $(call cmake_config,..)
 libwebp.mak_params?= -C build all install DESTDIR=$(call bld_path,libwebp)
 mjpegtools.cflags?="$(call inc_path,libjpeg) $(call ld_path,libjpeg,.libs)"