Magellan Linux

Diff of /trunk/include/meson.sminc

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 29797 by niro, Thu Oct 12 11:59:07 2017 UTC revision 29811 by niro, Thu Oct 12 14:09:19 2017 UTC
# Line 61  meson_configure() Line 61  meson_configure()
61   default_opts+=" --prefix=/usr"   default_opts+=" --prefix=/usr"
62   default_opts+=" --sysconfdir=/etc"   default_opts+=" --sysconfdir=/etc"
63   default_opts+=" --localstatedir=/var/lib"   default_opts+=" --localstatedir=/var/lib"
64   default_opts+=" --libdir=/usr/$(mlibdir)"   default_opts+=' --libdir=/usr/$(mlibdir)'
65   default_opts+=" --libexecdir=/usr/$(mlibdir)/${PNAME}"   default_opts+=' --libexecdir=/usr/$(mlibdir)/${PNAME}'
66    
67   if [[ ${MULTILIB_BUILD} = true ]]   if [[ ${MULTILIB_BUILD} = true ]]
68   then   then
# Line 76  mninja() Line 76  mninja()
76  {  {
77   if [[ ${MULTILIB_BUILD} = true ]]   if [[ ${MULTILIB_BUILD} = true ]]
78   then   then
79   all-abis ninja -C ${SRCDIR}-$(mabi)/${SRCSUBDIR} -v ${MAKEOPTS} "$@"   all-abis ninja -C ${SRCDIR}-$(mabi)/${SRCSUBDIR} -C ${BUILDDIR}/build-$(mabi) -v ${MAKEOPTS} "$@"
80   else   else
81   ninja -C ${SRCDIR}/${SRCSUBDIR} -v ${MAKEOPTS} "$@"   ninja -C ${SRCDIR}/${SRCSUBDIR} -C ${BUILDDIR}/build -v ${MAKEOPTS} "$@"
82   fi   fi
83  }  }
84    

Legend:
Removed from v.29797  
changed lines
  Added in v.29811