From 7b3aa4dd22aa7ad3b6003c2f08566f2712bc6934 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Wed, 1 Sep 2010 13:51:23 -0700 Subject: [PATCH] Move run-staprun into runtime/staprun/ It now lives with staprun itself. Also adjust run-stap accordingly. --- Makefile.in | 7 ++----- configure | 4 ---- configure.ac | 1 - run-stap.in | 2 +- runtime/staprun/Makefile.in | 7 +++++-- runtime/staprun/configure | 4 ++++ runtime/staprun/configure.ac | 1 + run-staprun.in => runtime/staprun/run-staprun.in | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) rename run-staprun.in => runtime/staprun/run-staprun.in (91%) diff --git a/Makefile.in b/Makefile.in index fb4f352bd..6b8e7183c 100644 --- 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 0f27fd8f5..f93c9e79b 100755 --- 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 a4d87bebe..45e2daa33 100644 --- 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 b4a654014..bf59dfffc 100644 --- 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 f2263aec3..22853eb6f 100644 --- 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 d37aa3ce6..01b1f215a 100755 --- 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 d7dcb90c7..6e80cfb17 100644 --- 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 e0615556b..dd80923bf 100644 --- 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+"$@"} -- 2.43.5