On Thu, 2011-07-07 at 22:41 -0700, Alan Coopersmith wrote:
> This reverts commit 4af24b2f5b3f8f2c20271ae323b6fa528b9b2127.
>
> Letting autoconf do it failed to handle the recursive expansion needed,
> resulting in "PATH=${exec_prefix}/lib/X11/x11perfcomp:..." without having
> exec_prefix defined in x11perfcomp.
> ---
> Makefile.am | 6 ++++++
> configure.ac | 1 -
> 2 files changed, 6 insertions(+), 1 deletions(-)
>
> diff --git a/Makefile.am b/Makefile.am
> index bb381d6..5cfedb4 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -48,6 +48,12 @@ x11perf_SOURCES = \
> x11perf.h
>
> bin_SCRIPTS = x11perfcomp
> +CLEANFILES = $(bin_SCRIPTS)
> +EXTRA_DIST = $(bin_SCRIPTS:=.in)
> +DIR_SUBSTS = -e 's|@x11perfcompdir[@]|$(x11perfcompdir)|g'
> +
> +x11perfcomp: x11perfcomp.in
> + $(AM_V_GEN)$(SED) $(DIR_SUBSTS) < $(srcdir)/[email protected] > $@
>
> dist_x11perfcomp_SCRIPTS = \
> fillblnk \
> diff --git a/configure.ac b/configure.ac
> index 1b62a88..dfbed8e 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -79,7 +79,6 @@ yes)
> esac
>
> AC_CONFIG_FILES([
> - x11perfcomp
> Makefile
> man/Makefile])
> AC_OUTPUTReviewed-by: Gaetan Nadon <[email protected]>
signature.asc
Description: This is a digitally signed message part
_______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
