diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2008-11-04 10:38:41 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2008-11-04 10:42:49 +0000 |
| commit | 3664b32195b101ebab9a5f9087095306f8969c80 (patch) | |
| tree | 3875b26e84f60b2a5e02bd19a82fba07a5b5be7b /util/cairo-trace/Makefile.am | |
| parent | 310026ab42c2078e2749c886c74c5b38cab41671 (diff) | |
[trace] Remove more @..@ from Makefile.am
Use $(..) for make variable substitution as opposed to incorrectly using
@..@ for substitution by configure.
Diffstat (limited to 'util/cairo-trace/Makefile.am')
| -rw-r--r-- | util/cairo-trace/Makefile.am | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/util/cairo-trace/Makefile.am b/util/cairo-trace/Makefile.am index c6caf0c6..f9c68b18 100644 --- a/util/cairo-trace/Makefile.am +++ b/util/cairo-trace/Makefile.am @@ -1,5 +1,5 @@ bin_SCRIPTS = cairo-trace -cairolibdir = @libdir@/cairo +cairolibdir = $(libdir)/cairo cairolib_LTLIBRARIES = cairo-trace.la AM_CPPFLAGS = -I$(top_srcdir)/src \ @@ -9,15 +9,15 @@ cairo_trace_la_SOURCES = \ lookup-symbol.c \ lookup-symbol.h \ trace.c -cairo_trace_la_CFLAGS = $(FREETYPE_CFLAGS) $(CAIRO_CFLAGS) +cairo_trace_la_CFLAGS = $(CAIRO_CFLAGS) cairo_trace_la_LDFLAGS = -module -no-undefined cairo_trace_la_LIBADD = -ldl -lz $(BFD_LIBS) -system-install: - grep -sq @cairolibdir@/cairo-trace.so /etc/ld.so.preload || echo @libdir@/cairo-trace.so >> /etc/ld.so.preload +system-install: install + grep -sq $(cairolibdir)/cairo-trace.so /etc/ld.so.preload || echo $(cairolibdir)/cairo-trace.so >> /etc/ld.so.preload -system-uninstall: - sed -e '@cairolibdir@\/cairo-trace.so/d' < /etc/ld.so.preload > /tmp/ld.so.preload && mv /tmp/ld.so.preload /etc/ld.so.preload; +system-uninstall: uninstall + sed -e '$(cairolibdir)\/cairo-trace.so/d' < /etc/ld.so.preload > /tmp/ld.so.preload && mv /tmp/ld.so.preload /etc/ld.so.preload; EXTRA_DIST = \ COPYING \ |