<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 TRANSITIONAL//EN">
<HTML>
<HEAD>
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=UTF-8">
<META NAME="GENERATOR" CONTENT="GtkHTML/3.32.2">
</HEAD>
<BODY>
On Fri, 2011-07-01 at 19:53 -0700, Alan Coopersmith wrote:
<BLOCKQUOTE TYPE=CITE>
<PRE>
Signed-off-by: Alan Coopersmith <<A HREF="mailto:alan.coopersmith@oracle.com">alan.coopersmith@oracle.com</A>>
---
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'
</PRE>
</BLOCKQUOTE>
<BR>
This is actually the preferred method for variables based on prefix and a recommendation from Automake.
<BLOCKQUOTE>
<PRE>
config.status: S["x11perfcompdir"]="${exec_prefix}/lib/X11/x11perfcomp"
</PRE>
</BLOCKQUOTE>
The variable ${exec_prefix} is not defined in the script.<BR>
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.<BR>
<BR>
<BLOCKQUOTE TYPE=CITE>
<PRE>
-
-x11perfcomp: x11perfcomp.in
- $(AM_V_GEN)$(SED) $(DIR_SUBSTS) < $(srcdir)/$@.in > $@
dist_x11perfcomp_SCRIPTS = \
fillblnk \
diff --git a/configure.ac b/configure.ac
index d23c209..0e5c297 100644
--- a/configure.ac
+++ b/configure.ac
@@ -76,6 +76,7 @@ yes)
esac
AC_CONFIG_FILES([
+ x11perfcomp
Makefile
man/Makefile])
AC_OUTPUT
</PRE>
</BLOCKQUOTE>
<BR>
<BR>
<BR>
</BODY>
</HTML>