Magellan Linux

  • Back to homepage
    • /[smage]/trunk/include/meson.sminc

    Diff of /trunk/include/meson.sminc

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

    revision 29811 by niro, Thu Oct 12 14:09:19 2017 UTC revision 30741 by niro, Tue Mar 27 12:08:28 2018 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"
      default_opts+=' --libdir=/usr/$(mlibdir)'  
    64   default_opts+=' --libexecdir=/usr/$(mlibdir)/${PNAME}'   default_opts+=' --libexecdir=/usr/$(mlibdir)/${PNAME}'
    65    
    66   if [[ ${MULTILIB_BUILD} = true ]]   if [[ ${MULTILIB_BUILD} = true ]]
    67   then   then
    68     # must be escaped so the mlibdir variable gets evaluated later
    69     default_opts+=' --libdir=/usr/$(mlibdir)'
    70   all-abis meson setup ${default_opts} ${configure_opts} ${SRCDIR}-$(mabi)/${SRCSUBDIR} ${BUILDDIR}/build-$(mabi) || die   all-abis meson setup ${default_opts} ${configure_opts} ${SRCDIR}-$(mabi)/${SRCSUBDIR} ${BUILDDIR}/build-$(mabi) || die
    71   else   else
    72     # the mlibdir variable gets right now evaluated
    73     default_opts+=" --libdir=/usr/$(mlibdir)"
    74   meson setup ${default_opts} ${configure_opts} ${SRCDIR}/${SRCSUBDIR} ${BUILDDIR}/build || die   meson setup ${default_opts} ${configure_opts} ${SRCDIR}/${SRCSUBDIR} ${BUILDDIR}/build || die
    75   fi   fi
    76  }  }
    Legend:
    Removed from v.29811  
    changed lines
      Added in v.30741