2005-07-26 Martin Hunt <hunt@redhat.com>

	* Makefile.am (AM_CPPFLAGS): Set PKGLIBDIR correctly.

diff --git a/ChangeLog b/ChangeLog
index 5d08c22dae38e2827f9f016055da8c3a7c802356..022d93778ddb91fab9cbe78f4827f28f46a9c56c 100644 (file)
--- 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 9be8fb1e8b98b08f3f4962c3ba8d6649d9cadf59..a689999da49245d54ec44910fb1b4b49e483c476 100644 (file)
--- 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 d270e969ed0a3fbc6be2bc995bb889e5372508ae..730161e14c30617f41542c543fb19636e535a14c 100644 (file)
--- 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 \