[PATCH:x11perf] Let autoconf generate x11perfcomp directly instead of doing it via sed

Alan Coopersmith alan.coopersmith at oracle.com
Wed Jul 6 18:20:41 PDT 2011


On 07/ 6/11 06:10 PM, Gaetan Nadon wrote:
> On Fri, 2011-07-01 at 19:53 -0700, Alan Coopersmith wrote:
>> Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com <mailto:alan.coopersmith at oracle.com>>
>> ---
>>  Makefile.am  |    6 ------
>>  configure.ac |    1 +
>>  2 files changed, 1 insertions(+), 6 deletions(-)
>>
>> diff --git a/Makefile.am b/Makefile.am
>> index 5cfedb4..bb381d6 100644
>> --- a/Makefile.am
>> +++ b/Makefile.am
>> @@ -48,12 +48,6 @@ x11perf_SOURCES =	\
>>          x11perf.h
>>  
>>  bin_SCRIPTS = x11perfcomp
>> -CLEANFILES = $(bin_SCRIPTS)
>> -EXTRA_DIST = $(bin_SCRIPTS:=.in)
>> -DIR_SUBSTS = -e 's|@x11perfcompdir[@]|$(x11perfcompdir)|g'
> 
> This is actually the preferred method for variables based on prefix and a
> recommendation from Automake.

Sorry, which is "this"?  The way it was or the way I made it?
I pushed this patch today since I hadn't gotten feedback, but it's easy to
push a revert or better fix.

>     config.status: S["x11perfcompdir"]="${exec_prefix}/lib/X11/x11perfcomp"
> 
> The variable ${exec_prefix} is not defined in the script.
> I have submitted a similar patches in the past and a reviewer was kind enough to
> point it out. I had included $exec_prefix and $prefix but we get into a
> cascading variable definitions.

Ah yes, I guess it does leave it as:
PATH=${exec_prefix}/lib/X11/x11perfcomp:[...] in the output script - guess
I missed that before.

So I guess I should revert this out.

-- 
	-Alan Coopersmith-        alan.coopersmith at oracle.com
	 Oracle Solaris Platform Engineering: X Window System



More information about the xorg-devel mailing list