diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-07-07 17:16:52 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-07-10 17:58:45 -0700 |
| commit | 86cf2ab52ad5c6b4b262c1673ad5bd4c8713e3e8 (patch) | |
| tree | 2dbab9f282ab8cc8737b28c1f302c31b8b66b570 | |
| parent | be99f1c0ecac26255aa9b0bb0347bab1b6e0fb88 (diff) | |
Revert "Let autoconf generate x11perfcomp directly instead of doing it via sed"
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.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | 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)/$@.in > $@ 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_OUTPUT |