diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Makefile.am | 7 | ||||
| -rw-r--r-- | Makefile.in | 6 | ||||
| -rw-r--r-- | systemtap.spec.in | 3 |
4 files changed, 16 insertions, 7 deletions
@@ -1,3 +1,10 @@ +2005-07-26 Martin Hunt <hunt@redhat.com> + + * Makefile.am (stpd_LDFLAGS): Set rpath correclty because otherwise + automake doesn't seem to get it right when binaries are in libexec subdirs. + (AM_CPPFLAGS): revert. + * systemtap.spec.in (LDFLAGS): Set libexecdir here instead. + 2005-07-26 Frank Ch. Eigler <fche@redhat.com> Support %{ embedded-c %} diff --git a/Makefile.am b/Makefile.am index de152e92..210424e7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,11 +1,9 @@ # Makefile.am --- automake input file for systemtap ## process this file with automake to produce Makefile.in -libexecdir = @libexecdir@/@PACKAGE@ - AM_MAKEFLAGS = 'CXXFLAGS=$(CXXFLAGS)' 'LDFLAGS=$(LDFLAGS)' -AM_CPPFLAGS = -DPKGLIBDIR='"${libexecdir}"' \ +AM_CPPFLAGS = -DPKGLIBDIR='"${libexecdir}/${PACKAGE}"' \ -DPKGDATADIR='"${datadir}/${PACKAGE}"' bin_PROGRAMS = stap @@ -16,7 +14,8 @@ stap_SOURCES = main.cxx \ libexec_PROGRAMS = stpd stpd_SOURCES = runtime/stpd/stpd.c runtime/stpd/librelay.c stpd_LDADD = -lpthread - +# automake doesn't get rpath right unless we do this +stpd_LDFLAGS = -Wl,-rpath '$(libdir)/systemtap' AM_CXXFLAGS = -Wall # Get extra libs as needed diff --git a/Makefile.in b/Makefile.in index 4ca59a02..66428825 100644 --- a/Makefile.in +++ b/Makefile.in @@ -169,7 +169,7 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ -libexecdir = @libexecdir@/@PACKAGE@ +libexecdir = @libexecdir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -181,7 +181,7 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ AM_MAKEFLAGS = 'CXXFLAGS=$(CXXFLAGS)' 'LDFLAGS=$(LDFLAGS)' -AM_CPPFLAGS = -DPKGLIBDIR='"${libexecdir}"' \ +AM_CPPFLAGS = -DPKGLIBDIR='"${libexecdir}/${PACKAGE}"' \ -DPKGDATADIR='"${datadir}/${PACKAGE}"' stap_SOURCES = main.cxx \ @@ -190,6 +190,8 @@ stap_SOURCES = main.cxx \ stpd_SOURCES = runtime/stpd/stpd.c runtime/stpd/librelay.c stpd_LDADD = -lpthread +# automake doesn't get rpath right unless we do this +stpd_LDFLAGS = -Wl,-rpath '$(libdir)/systemtap' AM_CXXFLAGS = -Wall # Get extra libs as needed diff --git a/systemtap.spec.in b/systemtap.spec.in index 58fa628c..c3f59428 100644 --- a/systemtap.spec.in +++ b/systemtap.spec.in @@ -89,7 +89,8 @@ make docs %install rm -rf ${RPM_BUILD_ROOT} -make DESTDIR=${RPM_BUILD_ROOT} install + +%makeinstall libexecdir=${RPM_BUILD_ROOT}%{_libexecdir}/systemtap %if %{bundled_elfutils} installed_elfutils=${RPM_BUILD_ROOT}%{_libdir}/%{name} |