From 30d167f3c4748619f4aa09955628872d7f044e6f Mon Sep 17 00:00:00 2001 From: youri Date: Wed, 16 Jan 2019 01:59:16 +0100 Subject: [PATCH] Fix compilation --- cinnamon-desktop/Makefile | 2 +- cjs/Makefile | 2 +- nemo/Makefile | 4 ++-- xapps/Makefile | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cinnamon-desktop/Makefile b/cinnamon-desktop/Makefile index 4327346233..1bf27c3a68 100644 --- a/cinnamon-desktop/Makefile +++ b/cinnamon-desktop/Makefile @@ -23,7 +23,7 @@ PKGCONFIG_OVERRIDE+= libcinnamon-desktop/cinnamon-desktop.pc.in BUILD_DEPENDS+= autoconf-archive-[0-9]*:../../devel/autoconf-archive -#MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/libcvc:${WRKSRC}/output/libcinnamon-desktop +MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/libcvc:${WRKSRC}/output/libcinnamon-desktop pre-install: ${CHMOD} +x ${WRKSRC}/install-scripts/meson_install_schemas.py diff --git a/cjs/Makefile b/cjs/Makefile index b4c85054c3..238446490a 100644 --- a/cjs/Makefile +++ b/cjs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2015/02/19 21:21:12 jihbed Exp $ +# $NetBSD$: Makefile,v 1.1 2015/02/19 21:21:12 jihbed Exp $ DISTNAME= cjs-4.0.0 CATEGORIES= sysutils diff --git a/nemo/Makefile b/nemo/Makefile index 64f7e0550e..d4a5ceba12 100644 --- a/nemo/Makefile +++ b/nemo/Makefile @@ -37,8 +37,8 @@ REPLACE_PYTHON= data/merge_action_strings \ # helps build but creates typelib with wrong path! (libcvc/libnemo-private.so instead of path/lib/lib.so) # check /usr/pkg/share/gir-1.0 for dubious lib paths -#MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/libcvc:${WRKSRC}/output/libnemo-private -#MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/libcvc:${WRKSRC}/output/libnemo-extension +MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/libcvc:${WRKSRC}/output/libnemo-private +MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/libcvc:${WRKSRC}/output/libnemo-extension .include "../../devel/py-meson/build.mk" .include "../../lang/python/application.mk" diff --git a/xapps/Makefile b/xapps/Makefile index 5d9ff533fa..98b8303964 100644 --- a/xapps/Makefile +++ b/xapps/Makefile @@ -20,7 +20,7 @@ SUBST_VARS.pypath= PREFIX PYTHONBIN PY_PATCHPLIST= yes -#MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/libxapp +MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/libxapp USE_TOOLS+= gmake bash pkg-config intltool msgfmt