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

	* Makefile.am: Make sure stpd goes into libexec/systemtap/
	* Makefile.in: Regenerated.

diff --git a/ChangeLog b/ChangeLog
index 1ad2e6f828694e67e48769aa8aa1512ea7ffcdfa..a3253e5bbb6aaabe565b21f340de637576040804 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-29  Frank Ch. Eigler  <fche@redhat.com>
+
+       * Makefile.am: Make sure stpd goes into libexec/systemtap/
+       * Makefile.in: Regenerated.
+
 2005-07-29  Frank Ch. Eigler  <fche@redhat.com>
 
        * configure.ac: Fail configure stage if elfutils 0.111+ is not found.

diff --git a/Makefile.am b/Makefile.am
index e9254181010033f69bc9be7bc16b60573b6e56d3..153c4cb432a517749e720814273022717d2d2f87 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,9 @@ stap_LDADD = @stap_LIBS@
 
 stap_CXXFLAGS = -Werror $(AM_CXXFLAGS)
 
-libexec_PROGRAMS = stpd
+# stpd goes into $libexec/$package, so libexec_PROGRAMS would
+# put it into the wrong location
+noinst_PROGRAMS = stpd
 stpd_SOURCES = runtime/stpd/stpd.c runtime/stpd/librelay.c
 stpd_LDADD = -lpthread
 
@@ -30,6 +32,10 @@ dist-hook:
        find $(distdir) -name CVS -o -name '*~' -o -name '.#*' | xargs rm -rf
        find $(distdir) -name '*.o' -o -name '*.ko' -o -name '*.cmd' -o -name '*.mod.c' -o -name '.??*' | xargs rm -rf
 
+install-exec-local:
+       mkdir -p $(DESTDIR)$(libexecdir)/systemtap
+       $(INSTALL) stpd $(DESTDIR)$(libexecdir)/systemtap
+
 install-data-local:
        mkdir -p $(DESTDIR)$(pkgdatadir)/runtime/transport
        cp -rp $(srcdir)/runtime/*.[ch] $(srcdir)/runtime/Doxyfile \

diff --git a/Makefile.in b/Makefile.in
index 8d084d7530a25018208ea2ff5e689838388bd906..baae40d98c29702975ce754e43623c3f45a78372 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -39,7 +39,7 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 bin_PROGRAMS = stap$(EXEEXT)
-libexec_PROGRAMS = stpd$(EXEEXT)
+noinst_PROGRAMS = stpd$(EXEEXT)
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \
        $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
@@ -55,11 +55,9 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES = systemtap.spec
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" \
-       "$(DESTDIR)$(man1dir)"
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS)
+PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
 am_stap_OBJECTS = stap-main.$(OBJEXT) stap-parse.$(OBJEXT) \
        stap-staptree.$(OBJEXT) stap-elaborate.$(OBJEXT) \
        stap-translate.$(OBJEXT) stap-tapsets.$(OBJEXT) \
@@ -302,29 +300,9 @@ uninstall-binPROGRAMS:
 
 clean-binPROGRAMS:
        -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-install-libexecPROGRAMS: $(libexec_PROGRAMS)
-       @$(NORMAL_INSTALL)
-       test -z "$(libexecdir)" || $(mkdir_p) "$(DESTDIR)$(libexecdir)"
-       @list='$(libexec_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; \
-         else :; fi; \
-       done
-
-uninstall-libexecPROGRAMS:
-       @$(NORMAL_UNINSTALL)
-       @list='$(libexec_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"; \
-       done
 
-clean-libexecPROGRAMS:
-       -test -z "$(libexec_PROGRAMS)" || rm -f $(libexec_PROGRAMS)
+clean-noinstPROGRAMS:
+       -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
 stap$(EXEEXT): $(stap_OBJECTS) $(stap_DEPENDENCIES) 
        @rm -f stap$(EXEEXT)
        $(CXXLINK) $(stap_LDFLAGS) $(stap_OBJECTS) $(stap_LDADD) $(LIBS)
@@ -805,7 +783,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(PROGRAMS) $(MANS) config.h
 installdirs:
-       for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(man1dir)"; do \
+       for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \
          test -z "$$dir" || $(mkdir_p) "$$dir"; \
        done
 install: install-am
@@ -834,8 +812,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-noinstPROGRAMS mostlyclean-am
 
 distclean: distclean-am
        -rm -f $(am__CONFIG_DISTCLEAN_FILES)
@@ -856,7 +834,7 @@ info-am:
 
 install-data-am: install-data-local install-man
 
-install-exec-am: install-binPROGRAMS install-libexecPROGRAMS
+install-exec-am: install-binPROGRAMS install-exec-local
 
 install-info: install-info-am
 
@@ -883,32 +861,34 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
-       uninstall-libexecPROGRAMS uninstall-man
+uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-man
 
 uninstall-man: uninstall-man1
 
 .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-noinstPROGRAMS 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-data-local install-exec install-exec-am install-info \
-       install-info-am install-libexecPROGRAMS install-man \
+       install-data-local install-exec install-exec-am \
+       install-exec-local install-info install-info-am install-man \
        install-man1 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 uninstall-man \
-       uninstall-man1
+       uninstall-info-am uninstall-man uninstall-man1
 
 dist-hook:
        find $(distdir) -name CVS -o -name '*~' -o -name '.#*' | xargs rm -rf
        find $(distdir) -name '*.o' -o -name '*.ko' -o -name '*.cmd' -o -name '*.mod.c' -o -name '.??*' | xargs rm -rf
 
+install-exec-local:
+       mkdir -p $(DESTDIR)$(libexecdir)/systemtap
+       $(INSTALL) stpd $(DESTDIR)$(libexecdir)/systemtap
+
 install-data-local:
        mkdir -p $(DESTDIR)$(pkgdatadir)/runtime/transport
        cp -rp $(srcdir)/runtime/*.[ch] $(srcdir)/runtime/Doxyfile \