2005-07-14 Frank Ch. Eigler <fche@redhat.com>

	* Makefile.am (stpd): Install in $pkglibdir.
	(runtime): Copy to $pkgdatadir.
	* configure.ac: Pass along pkgdatadir and pkglibdir.
	* main.cxx: Default runtime_path from pkgdatadir.
	* buildrun.cxx (run_pass): Correct stpd directory.
	* Makefile.in, configure, config.in: Regenerated.

9 files changed, 86 insertions, 73 deletions

diff --git a/ChangeLog b/ChangeLog
index 4ccbc9a7..44bfae97 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-07-14  Frank Ch. Eigler  <fche@redhat.com>
+
+	* Makefile.am (stpd): Install in $pkglibdir.
+	(runtime): Copy to $pkgdatadir.
+	* configure.ac: Pass along pkgdatadir and pkglibdir.
+	* main.cxx: Default runtime_path from pkgdatadir.
+	* buildrun.cxx (run_pass): Correct stpd directory.
+	* Makefile.in, configure, config.in: Regenerated.
+
 2005-07-12  Graydon Hoare  <graydon@redhat.com>
 
 	* elaborate.cxx
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 2f817ffd..00000000
--- a/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-OBJS
-
-
-
-all: stap
-
-
-stap: $(OBJS)
-	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
diff --git a/Makefile.am b/Makefile.am
index 825aca21..b2ba7b1f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,7 @@ stap_SOURCES = main.cxx \
 	parse.cxx staptree.cxx elaborate.cxx translate.cxx \
 	tapsets.cxx buildrun.cxx
 
-libexec_PROGRAMS = stpd
+pkglib_PROGRAMS = stpd
 stpd_SOURCES = runtime/stpd/stpd.c runtime/stpd/librelay.c
 stpd_LDADD = -lpthread
 
@@ -17,18 +17,15 @@ AM_CXXFLAGS = -Wall
 # Get extra libs as needed
 LDADD =
 
-# Set autoconf Makefile.in variables correctly
-datadir = @datadir@
-stapdatadir = @datadir@/systemtap
-
-# stuff for compiling gawk/pgawk
-DEFPATH="\".$(PATH_SEPARATOR)$(stapdatadir)\""
-DEFS= -DDEFPATH=$(DEFPATH) -DHAVE_CONFIG_H
-
 EXTRA_DIST=testsuite runtime
 dist-hook:
 	find $(distdir)/testsuite -name CVS -o -name '*~' -o -name '.#*' | xargs rm -rf
 
+install-data-local:
+	mkdir -p $(DESTDIR)$(pkgdatadir)
+	cp -rp $(srcdir)/runtime $(DESTDIR)$(pkgdatadir)
+	find $(DESTDIR)$(pkgdatadir)/testsuite -name CVS -o -name '*~' -o -name '.#*' | xargs rm -rf
+
 p=$(srcdir)/testsuite/parse
 s=$(srcdir)/testsuite/sem
 t=$(srcdir)/testsuite/trans
diff --git a/Makefile.in b/Makefile.in
index 9b7421ac..f7023074 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -39,7 +39,7 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 bin_PROGRAMS = stap$(EXEEXT)
-libexec_PROGRAMS = stpd$(EXEEXT)
+pkglib_PROGRAMS = stpd$(EXEEXT)
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.in \
@@ -54,10 +54,10 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)"
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkglibdir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS)
+pkglibPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(bin_PROGRAMS) $(pkglib_PROGRAMS)
 am_stap_OBJECTS = main.$(OBJEXT) parse.$(OBJEXT) staptree.$(OBJEXT) \
 	elaborate.$(OBJEXT) translate.$(OBJEXT) tapsets.$(OBJEXT) \
 	buildrun.$(OBJEXT)
@@ -113,7 +113,7 @@ CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATE = @DATE@
-DEFS = -DDEFPATH=$(DEFPATH) -DHAVE_CONFIG_H
+DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -125,7 +125,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LDFLAGS = @LDFLAGS@
-LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
@@ -142,6 +141,8 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PKGDATADIR = @PKGDATADIR@
+PKGLIBDIR = @PKGLIBDIR@
 RANLIB = @RANLIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -163,8 +164,6 @@ am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
 build_alias = @build_alias@
-
-# Set autoconf Makefile.in variables correctly
 datadir = @datadir@
 exec_prefix = @exec_prefix@
 host_alias = @host_alias@
@@ -194,10 +193,6 @@ AM_CXXFLAGS = -Wall
 
 # Get extra libs as needed
 LDADD = 
-stapdatadir = @datadir@/systemtap
-
-# stuff for compiling gawk/pgawk
-DEFPATH = "\".$(PATH_SEPARATOR)$(stapdatadir)\""
 EXTRA_DIST = testsuite runtime
 p = $(srcdir)/testsuite/parse
 s = $(srcdir)/testsuite/sem
@@ -289,29 +284,29 @@ uninstall-binPROGRAMS:
 
 clean-binPROGRAMS:
 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-install-libexecPROGRAMS: $(libexec_PROGRAMS)
+install-pkglibPROGRAMS: $(pkglib_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(libexecdir)" || $(mkdir_p) "$(DESTDIR)$(libexecdir)"
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
+	test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
+	@list='$(pkglib_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(pkglibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(pkglibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(pkglibdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
-uninstall-libexecPROGRAMS:
+uninstall-pkglibPROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
+	@list='$(pkglib_PROGRAMS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(libexecdir)/$$f"; \
+	  echo " rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \
 	done
 
-clean-libexecPROGRAMS:
-	-test -z "$(libexec_PROGRAMS)" || rm -f $(libexec_PROGRAMS)
+clean-pkglibPROGRAMS:
+	-test -z "$(pkglib_PROGRAMS)" || rm -f $(pkglib_PROGRAMS)
 stap$(EXEEXT): $(stap_OBJECTS) $(stap_DEPENDENCIES) 
 	@rm -f stap$(EXEEXT)
 	$(CXXLINK) $(stap_LDFLAGS) $(stap_OBJECTS) $(stap_LDADD) $(LIBS)
@@ -647,7 +642,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(PROGRAMS) config.h
 installdirs:
-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)"; do \
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkglibdir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
@@ -676,8 +671,8 @@ maintainer-clean-generic:
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
-clean-am: clean-binPROGRAMS clean-generic clean-libexecPROGRAMS \
-	clean-local mostlyclean-am
+clean-am: clean-binPROGRAMS clean-generic clean-local \
+	clean-pkglibPROGRAMS mostlyclean-am
 
 distclean: distclean-am
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
@@ -696,9 +691,9 @@ info: info-am
 
 info-am:
 
-install-data-am:
+install-data-am: install-data-local
 
-install-exec-am: install-binPROGRAMS install-libexecPROGRAMS
+install-exec-am: install-binPROGRAMS install-pkglibPROGRAMS
 
 install-info: install-info-am
 
@@ -726,27 +721,32 @@ ps: ps-am
 ps-am:
 
 uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
-	uninstall-libexecPROGRAMS
+	uninstall-pkglibPROGRAMS
 
 .PHONY: CTAGS GTAGS all all-am am--refresh check check-TESTS check-am \
-	clean clean-binPROGRAMS clean-generic clean-libexecPROGRAMS \
-	clean-local ctags dist dist-all dist-bzip2 dist-gzip dist-hook \
-	dist-shar dist-tarZ dist-zip distcheck distclean \
+	clean clean-binPROGRAMS clean-generic clean-local \
+	clean-pkglibPROGRAMS ctags dist dist-all dist-bzip2 dist-gzip \
+	dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \
 	distclean-compile distclean-generic distclean-hdr \
 	distclean-tags distcleancheck distdir distuninstallcheck dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-binPROGRAMS install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am \
-	install-libexecPROGRAMS install-man install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-binPROGRAMS uninstall-info-am \
-	uninstall-libexecPROGRAMS
+	install-binPROGRAMS install-data install-data-am \
+	install-data-local install-exec install-exec-am install-info \
+	install-info-am install-man install-pkglibPROGRAMS \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-binPROGRAMS \
+	uninstall-info-am uninstall-pkglibPROGRAMS
 
 dist-hook:
 	find $(distdir)/testsuite -name CVS -o -name '*~' -o -name '.#*' | xargs rm -rf
 
+install-data-local:
+	mkdir -p $(DESTDIR)$(pkgdatadir)
+	cp -rp $(srcdir)/runtime $(DESTDIR)$(pkgdatadir)
+	find $(DESTDIR)$(pkgdatadir)/testsuite -name CVS -o -name '*~' -o -name '.#*' | xargs rm -rf
+
 gcov:
 	@$(MAKE) clean CXXFLAGS="-g -fprofile-arcs -ftest-coverage" all check
 	@gcov *.gcno >/dev/null 2>&1
diff --git a/buildrun.cxx b/buildrun.cxx
index 2ec5e03c..e1663d6e 100644
--- a/buildrun.cxx
+++ b/buildrun.cxx
@@ -70,8 +70,10 @@ run_pass (systemtap_session& s)
       sighandler_t oldsig = signal (SIGINT, SIG_IGN);
 
       // for now, just spawn stpd
-      string stpd_cmd = string("/usr/bin/sudo ") +
-        string(LIBEXECDIR) + "/stpd " + s.tmpdir + "/" + s.module_name + ".ko";
+      string stpd_cmd = string("/usr/bin/sudo ") 
+        + string(PKGLIBDIR) + "/stpd "
+        + (s.verbose ? "" : "-q ")
+        + s.tmpdir + "/" + s.module_name + ".ko";
       if (s.verbose) clog << "Running " << stpd_cmd << endl;
       int rc = system (stpd_cmd.c_str ());
       
diff --git a/config.in b/config.in
index caf3ecc9..9c833723 100644
--- a/config.in
+++ b/config.in
@@ -48,9 +48,6 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
-/* libexecdir */
-#undef LIBEXECDIR
-
 /* Name of package */
 #undef PACKAGE
 
@@ -69,6 +66,12 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
+/* datadir */
+#undef PKGDATADIR
+
+/* pkglibdir */
+#undef PKGLIBDIR
+
 /* Define to 1 if the C compiler supports function prototypes. */
 #undef PROTOTYPES
 
diff --git a/configure b/configure
index 49eed68d..37e9bbcb 100755
--- a/configure
+++ b/configure
@@ -310,7 +310,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CPP EGREP U ANSI2KNR RANLIB ac_ct_RANLIB CXXCPP DATE LIBEXECDIR LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CPP EGREP U ANSI2KNR RANLIB ac_ct_RANLIB CXXCPP DATE PKGLIBDIR PKGDATADIR LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -5697,10 +5697,18 @@ _ACEOF
 # my_libexecdir=`eval echo $libexecdir`
 # my_libexecdir="$libexecdir"
 
-my_libexecdir=${prefix}/libexec
+my_pkglibdir=${prefix}/lib/systemtap
 
 cat >>confdefs.h <<_ACEOF
-#define LIBEXECDIR "$my_libexecdir"
+#define PKGLIBDIR "$my_pkglibdir"
+_ACEOF
+
+
+
+my_pkgdatadir=${prefix}/share/systemtap
+
+cat >>confdefs.h <<_ACEOF
+#define PKGDATADIR "$my_pkgdatadir"
 _ACEOF
 
 
@@ -6423,7 +6431,8 @@ s,@RANLIB@,$RANLIB,;t t
 s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
 s,@CXXCPP@,$CXXCPP,;t t
 s,@DATE@,$DATE,;t t
-s,@LIBEXECDIR@,$LIBEXECDIR,;t t
+s,@PKGLIBDIR@,$PKGLIBDIR,;t t
+s,@PKGDATADIR@,$PKGDATADIR,;t t
 s,@LIBOBJS@,$LIBOBJS,;t t
 s,@LTLIBOBJS@,$LTLIBOBJS,;t t
 CEOF
diff --git a/configure.ac b/configure.ac
index 07869557..29f80630 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,9 +38,13 @@ AC_SUBST(DATE)
 # my_libexecdir=`eval echo $libexecdir`
 # my_libexecdir="$libexecdir"
 
-my_libexecdir=${prefix}/libexec
-AC_DEFINE_UNQUOTED(LIBEXECDIR, "$my_libexecdir", [libexecdir])
-AC_SUBST(LIBEXECDIR)
+my_pkglibdir=${prefix}/lib/systemtap
+AC_DEFINE_UNQUOTED(PKGLIBDIR, "$my_pkglibdir", [pkglibdir])
+AC_SUBST(PKGLIBDIR)
+
+my_pkgdatadir=${prefix}/share/systemtap
+AC_DEFINE_UNQUOTED(PKGDATADIR, "$my_pkgdatadir", [datadir])
+AC_SUBST(PKGDATADIR)
 
 AC_CONFIG_HEADERS([config.h:config.in])
 AC_CONFIG_FILES(Makefile)
diff --git a/main.cxx b/main.cxx
index 43a41cda..69f87655 100644
--- a/main.cxx
+++ b/main.cxx
@@ -108,7 +108,7 @@ main (int argc, char * const argv [])
   s.verbose = false;
   s.test_mode = false;
   s.last_pass = 5;
-  s.runtime_path = "/usr/share/systemtap/runtime"; // XXX
+  s.runtime_path = string(PKGDATADIR) + "/runtime";
   s.module_name = "stap_" + stringify(getuid()) + "_" + stringify(time(0));
   s.keep_tmpdir = false;