summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.am3
-rw-r--r--Makefile.in3
-rw-r--r--systemtap.spec.in7
4 files changed, 11 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index af0e767f..ebb9e1cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2007-02-26 David Smith <dsmith@redhat.com>
+ * Makefile.am: Removed 'update-examples' target. Moved
+ functionality to systemtap.spec.in.
+ * Makefile.in: Regenerated from Makefile.am.
+ * systemtap.spec.in: Fixes paths in the example scripts directly.
+
* Makefile.am: Added 'update-examples' target that fixes paths in
the example code we ship in the rpm.
* Makefile.in: Regenerated from Makefile.am.
diff --git a/Makefile.am b/Makefile.am
index 4ece8e70..94808fa0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -132,6 +132,3 @@ SUBDIRS = testsuite
if BUILD_LKET_B2A
SUBDIRS += runtime/lket/b2a
endif
-
-update-examples:
- find examples -type f -name '*.stp' -print0 | xargs -0 sed -i -r -e '1s@^#!.+stap@#!$(bindir)/stap@'
diff --git a/Makefile.in b/Makefile.in
index 2ab03fb7..a72a7fb8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1274,9 +1274,6 @@ uninstall-local:
rm -rf $(DESTDIR)$(pkgdatadir)
rm -rf $(DESTDIR)$(libexecdir)/$(PACKAGE)
-rm -rf $(DESTDIR)$(localstatedir)/cache/$(PACKAGE)
-
-update-examples:
- find examples -type f -name '*.stp' -print0 | xargs -0 sed -i -r -e '1s@^#!.+stap@#!$(bindir)/stap@'
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/systemtap.spec.in b/systemtap.spec.in
index d5a6efcf..789fe25d 100644
--- a/systemtap.spec.in
+++ b/systemtap.spec.in
@@ -103,7 +103,9 @@ cd ..
%configure %{?elfutils_config}
make %{?_smp_mflags}
-make update-examples
+
+# Fix paths in the example scripts
+find examples -type f -name '*.stp' -print0 | xargs -0 sed -i -r -e '1s@^#!.+stap@#!%{_bindir}/stap@'
%install
rm -rf ${RPM_BUILD_ROOT}
@@ -145,6 +147,9 @@ rm -rf ${RPM_BUILD_ROOT}
%{_bindir}/staprun
%changelog
+* Mon Feb 26 2007 David Smith <dsmith@redhat.com> - 0.5.13-1
+- Fixes systemtap path in example scripts.
+
* Mon Jan 1 2007 Frank Ch. Eigler <fche@redhat.com> - 0.5.12-1
- Many changes, see NEWS file.