Move run-staprun into runtime/staprun/

It now lives with staprun itself.  Also adjust run-stap accordingly.

diff --git a/Makefile.in b/Makefile.in
index fb4f352bdf66022bcdb91447ea6544685f11614a..6b8e7183c59ca5e6a2d0d79be6f5627858d0c5fd 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -75,8 +75,7 @@ DIST_COMMON = INSTALL NEWS README AUTHORS $(srcdir)/Makefile.in \
        $(am__configure_deps) $(srcdir)/config.in \
        $(srcdir)/stappaths.7.in $(top_srcdir)/initscript/systemtap.in \
        $(top_srcdir)/initscript/stap-server.in $(srcdir)/run-stap.in \
-       $(srcdir)/run-staprun.in $(srcdir)/dtrace.in depcomp \
-       $(oldinclude_HEADERS)
+       $(srcdir)/dtrace.in depcomp $(oldinclude_HEADERS)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -86,7 +85,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES = stappaths.7 initscript/systemtap \
-       initscript/stap-server run-stap run-staprun dtrace
+       initscript/stap-server run-stap dtrace
 CONFIG_CLEAN_VPATH_FILES =
 @BUILD_TRANSLATOR_TRUE@am__EXEEXT_1 = stap$(EXEEXT)
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkglibexecdir)" \
@@ -508,8 +507,6 @@ initscript/stap-server: $(top_builddir)/config.status $(top_srcdir)/initscript/s
        cd $(top_builddir) && $(SHELL) ./config.status $@
 run-stap: $(top_builddir)/config.status $(srcdir)/run-stap.in
        cd $(top_builddir) && $(SHELL) ./config.status $@
-run-staprun: $(top_builddir)/config.status $(srcdir)/run-staprun.in
-       cd $(top_builddir) && $(SHELL) ./config.status $@
 dtrace: $(top_builddir)/config.status $(srcdir)/dtrace.in
        cd $(top_builddir) && $(SHELL) ./config.status $@
 install-binPROGRAMS: $(bin_PROGRAMS)

diff --git a/configure b/configure
index 0f27fd8f56058bac3c5d132e428a10afa51a2833..f93c9e79b1e66743603832b2552f314ad94b1d99 100755 (executable)
--- a/configure
+++ b/configure
@@ -7483,8 +7483,6 @@ if test $enable_translator == "yes"; then
        ac_config_files="$ac_config_files run-stap"
 
 fi
-ac_config_files="$ac_config_files run-staprun"
-
 ac_config_files="$ac_config_files dtrace"
 
 
@@ -8279,7 +8277,6 @@ do
     "initscript/systemtap") CONFIG_FILES="$CONFIG_FILES initscript/systemtap" ;;
     "initscript/stap-server") CONFIG_FILES="$CONFIG_FILES initscript/stap-server" ;;
     "run-stap") CONFIG_FILES="$CONFIG_FILES run-stap" ;;
-    "run-staprun") CONFIG_FILES="$CONFIG_FILES run-staprun" ;;
     "dtrace") CONFIG_FILES="$CONFIG_FILES dtrace" ;;
     "doc/beginners/publican.cfg") CONFIG_FILES="$CONFIG_FILES doc/beginners/publican.cfg:doc/SystemTap_Beginners_Guide/publican.cfg.in" ;;
     "doc/beginners") CONFIG_COMMANDS="$CONFIG_COMMANDS doc/beginners" ;;
@@ -8963,7 +8960,6 @@ $as_echo X"$file" |
 }
  ;;
     "run-stap":F) chmod +x run-stap ;;
-    "run-staprun":F) chmod +x run-staprun ;;
     "dtrace":F) chmod +x dtrace ;;
     "doc/beginners":C) rm -f $ac_abs_top_builddir/doc/beginners/en-US $ac_abs_top_builddir/doc/beginners/build/en-US/testsuite && mkdir -p $ac_abs_top_builddir/doc/beginners/build/en-US && ln -s $ac_abs_top_srcdir/doc/SystemTap_Beginners_Guide/en-US $ac_abs_top_builddir/doc/beginners/en-US && ln -s $ac_abs_top_srcdir/testsuite $ac_abs_top_builddir/doc/beginners/build/en-US/testsuite ;;
 

diff --git a/configure.ac b/configure.ac
index a4d87bebe97cc96b6b3470ff94d13e2b3b0802c8..45e2daa33312cc6723296f770b61c1572cd6c9be 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -516,7 +516,6 @@ AC_CONFIG_SUBDIRS(testsuite runtime/staprun)
 if test $enable_translator == "yes"; then
        AC_CONFIG_FILES([run-stap], [chmod +x run-stap])
 fi
-AC_CONFIG_FILES([run-staprun], [chmod +x run-staprun])
 AC_CONFIG_FILES([dtrace], [chmod +x dtrace])
 
 # Setup "shadow" directory doc/beginners that has everything setup for

diff --git a/run-stap.in b/run-stap.in
index b4a6540143e4bfc9332098ec1b9d2897f3e57769..bf59dfffcf5b0469b1482a7518491ae84cba0baa 100644 (file)
--- a/run-stap.in
+++ b/run-stap.in
@@ -19,7 +19,7 @@ esac
 # Set all the variables to find the source and build trees.
 SYSTEMTAP_TAPSET="${srcdir}/tapset"
 SYSTEMTAP_RUNTIME="${srcdir}/runtime"
-SYSTEMTAP_STAPRUN="${builddir}/run-staprun"
+SYSTEMTAP_STAPRUN="${builddir}/runtime/staprun/run-staprun"
 export SYSTEMTAP_TAPSET SYSTEMTAP_RUNTIME SYSTEMTAP_STAPRUN
 
 # If there were private elfutils libs built, use them.

diff --git a/runtime/staprun/Makefile.in b/runtime/staprun/Makefile.in
index f2263aec3af26ce8d092db57a255349fdd28fa2d..22853eb6ff21003b75466cfd703c8c0b2cf4cd57 100644 (file)
--- a/runtime/staprun/Makefile.in
+++ b/runtime/staprun/Makefile.in
@@ -42,7 +42,8 @@ pkglibexec_PROGRAMS = stapio$(EXEEXT)
 subdir = .
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
        $(top_srcdir)/configure $(am__configure_deps) \
-       $(srcdir)/config.in $(srcdir)/../../depcomp
+       $(srcdir)/config.in $(srcdir)/run-staprun.in \
+       $(srcdir)/../../depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -51,7 +52,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = run-staprun
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkglibexecdir)" \
        "$(DESTDIR)$(man8dir)"
@@ -272,6 +273,8 @@ $(srcdir)/config.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 
 distclean-hdr:
        -rm -f config.h stamp-h1
+run-staprun: $(top_builddir)/config.status $(srcdir)/run-staprun.in
+       cd $(top_builddir) && $(SHELL) ./config.status $@
 install-binPROGRAMS: $(bin_PROGRAMS)
        @$(NORMAL_INSTALL)
        test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"

diff --git a/runtime/staprun/configure b/runtime/staprun/configure
index d37aa3ce6d85d1e25dcedaa5c29f91c2fb9406f9..01b1f215a9461ca618c056f18f2c605657959575 100755 (executable)
--- a/runtime/staprun/configure
+++ b/runtime/staprun/configure
@@ -4582,6 +4582,8 @@ ac_config_headers="$ac_config_headers config.h:config.in"
 
 ac_config_files="$ac_config_files Makefile"
 
+ac_config_files="$ac_config_files run-staprun"
+
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -5307,6 +5309,7 @@ do
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.in" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+    "run-staprun") CONFIG_FILES="$CONFIG_FILES run-staprun" ;;
 
   *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
@@ -5986,6 +5989,7 @@ $as_echo X"$file" |
   done
 }
  ;;
+    "run-staprun":F) chmod +x run-staprun ;;
 
   esac
 done # for ac_tag

diff --git a/runtime/staprun/configure.ac b/runtime/staprun/configure.ac
index d7dcb90c7304944d339efd7a7c7857ce5f8f6e15..6e80cfb178a60a865cbf0b08572bdb29784517e3 100644 (file)
--- a/runtime/staprun/configure.ac
+++ b/runtime/staprun/configure.ac
@@ -55,4 +55,5 @@ AC_DEFINE_UNQUOTED([PKGDATADIR], ["$pkgdatadir"],
 
 AC_CONFIG_HEADERS([config.h:config.in])
 AC_CONFIG_FILES(Makefile)
+AC_CONFIG_FILES([run-staprun], [chmod +x run-staprun])
 AC_OUTPUT

diff --git a/run-staprun.in b/runtime/staprun/run-staprun.in
similarity index 91%
rename from run-staprun.in
rename to runtime/staprun/run-staprun.in
index e0615556b25a62a9cc3e2bfa7b3d3bf40de3999c..dd80923bf2c31a59663fa097127b2e2a7e5cf9e7 100644 (file)
--- a/run-staprun.in
+++ b/runtime/staprun/run-staprun.in
@@ -18,7 +18,7 @@ esac
 
 exec sudo -P "SYSTEMTAP_STAPIO=${builddir}/stapio" \
              "SYSTEMTAP_STAPRUN=${builddir}/run-staprun" \
-             "SYSTEMTAP_RUNTIME=${srcdir}/runtime" \
+             "SYSTEMTAP_RUNTIME=${srcdir}/.." \
              "SYSTEMTAP_REAL_UID=`id -ru`" \
              "SYSTEMTAP_REAL_GID=`id -rg`" \
              ${builddir}/staprun ${1+"$@"}