summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhunt <hunt>2005-07-26 21:08:00 +0000
committerhunt <hunt>2005-07-26 21:08:00 +0000
commitf05bc729c752cee5eb11fde9193eea12a21b0d12 (patch)
tree6e020fb9d3719a2e8705ceb1cbd057784773c61f
parent6c9f0d3733f8930c56e7999eec470333bcba54c9 (diff)
downloadsystemtap-steved-f05bc729c752cee5eb11fde9193eea12a21b0d12.tar.gz
systemtap-steved-f05bc729c752cee5eb11fde9193eea12a21b0d12.tar.xz
systemtap-steved-f05bc729c752cee5eb11fde9193eea12a21b0d12.zip
2005-07-26 Martin Hunt <hunt@redhat.com>
* Makefile.am (AM_CPPFLAGS): Set PKGLIBDIR correctly.
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.am2
-rw-r--r--Makefile.in2
3 files changed, 5 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 5d08c22d..022d9377 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,10 @@
2005-07-26 Martin Hunt <hunt@redhat.com>
- * systemtap.spec.in: Stpd goes in libexec/systemtap.
+ * Makefile.am (AM_CPPFLAGS): Set PKGLIBDIR correctly.
+2005-07-26 Martin Hunt <hunt@redhat.com>
+ * 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 <roland@redhat.com>
diff --git a/Makefile.am b/Makefile.am
index 9be8fb1e..a689999d 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 d270e969..730161e1 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 \