[PATCH modular 2/8] build.sh: add support for EPREFIX for architecture-dependent files

Trevor Woerner twoerner at gmail.com
Thu Dec 16 19:48:06 PST 2010


On Thu, Dec 16, 2010 at 9:31 PM, Gaetan Nadon <memsize at videotron.ca> wrote:
> ---
>  build.sh |   37 ++++++++++++++++++++++++++-----------
>  1 files changed, 26 insertions(+), 11 deletions(-)
>
> diff --git a/build.sh b/build.sh
> index 4979fc0..80452d3 100755
> --- a/build.sh
> +++ b/build.sh
> @@ -356,12 +358,15 @@ process() {
>
>     LIB_FLAGS=
>     if [ X"$LIBDIR" != X ]; then
> -       LIB_FLAGS="--libdir=${PREFIX}/${LIBDIR}"
> +       LIB_FLAGS="--libdir=${EPREFIX}/${LIBDIR}"
>     fi
>
>     # Use "sh autogen.sh" since some scripts are not executable in CVS
>     if [ $needs_config -eq 1 ] || [ X"$NOAUTOGEN" = X ]; then
> -       sh ${DIR_CONFIG}/${CONFCMD} --prefix=${PREFIX} ${LIB_FLAGS} \
> +       sh ${DIR_CONFIG}/${CONFCMD} \
> +           --prefix=${PREFIX} \
> +           ${EPREFIX_SET:+--exec-prefix="$EPREFIX"} \
> +           ${LIB_FLAGS} \
>            ${QUIET:+--quiet} \
>            ${CONFFLAGS} \
>            ${CC:+CC="$CC"} \

Instead of doing all the "EPREFIX_SET" stuff, couldn't we just do:

 +           ${EPREFIX:+--exec-prefix="$EPREFIX"} \

and leave off the rest of this patch? We don't really need another
variable whose defined or undefined state lets us know whether EPREFIX
is defined or not :-)


More information about the xorg-devel mailing list