From f05bc729c752cee5eb11fde9193eea12a21b0d12 Mon Sep 17 00:00:00 2001 From: hunt Date: Tue, 26 Jul 2005 21:08:00 +0000 Subject: [PATCH] 2005-07-26 Martin Hunt * Makefile.am (AM_CPPFLAGS): Set PKGLIBDIR correctly. --- ChangeLog | 5 +++-- Makefile.am | 2 +- Makefile.in | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5d08c22da..022d93778 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,10 @@ 2005-07-26 Martin Hunt - * systemtap.spec.in: Stpd goes in libexec/systemtap. + * Makefile.am (AM_CPPFLAGS): Set PKGLIBDIR correctly. +2005-07-26 Martin Hunt + * systemtap.spec.in: Stpd goes in libexec/systemtap. * Makefile.am (libexecdir): Set to libexecdir/systemtap. - * aclocal.m4, Makefile.in: Regenerated 2005-07-25 Roland McGrath diff --git a/Makefile.am b/Makefile.am index 9be8fb1e8..a689999da 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,7 +5,7 @@ libexecdir = @libexecdir@/@PACKAGE@ AM_MAKEFLAGS = 'CXXFLAGS=$(CXXFLAGS)' 'LDFLAGS=$(LDFLAGS)' -AM_CPPFLAGS = -DPKGLIBDIR='"${libexecdir}/${PACKAGE}"' \ +AM_CPPFLAGS = -DPKGLIBDIR='"${libexecdir}"' \ -DPKGDATADIR='"${datadir}/${PACKAGE}"' bin_PROGRAMS = stap diff --git a/Makefile.in b/Makefile.in index d270e969e..730161e14 100644 --- a/Makefile.in +++ b/Makefile.in @@ -181,7 +181,7 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ AM_MAKEFLAGS = 'CXXFLAGS=$(CXXFLAGS)' 'LDFLAGS=$(LDFLAGS)' -AM_CPPFLAGS = -DPKGLIBDIR='"${libexecdir}/${PACKAGE}"' \ +AM_CPPFLAGS = -DPKGLIBDIR='"${libexecdir}"' \ -DPKGDATADIR='"${datadir}/${PACKAGE}"' stap_SOURCES = main.cxx \ -- 2.43.5