diff options
| author | Dave Brolley <brolley@redhat.com> | 2009-09-14 17:47:26 -0400 |
|---|---|---|
| committer | Dave Brolley <brolley@redhat.com> | 2009-09-14 17:47:26 -0400 |
| commit | 9df741675d7e36008869dfff46ccc602875dc091 (patch) | |
| tree | 1deafeacb302f9154586708ada7a240470aa6b4a /Makefile.in | |
| parent | b232fab3a271c4c787462295d7ffbeca750c1092 (diff) | |
| parent | 775c3771bb4a5f663a763d7c65b1571e24e4b212 (diff) | |
| download | systemtap-steved-9df741675d7e36008869dfff46ccc602875dc091.tar.gz systemtap-steved-9df741675d7e36008869dfff46ccc602875dc091.tar.xz systemtap-steved-9df741675d7e36008869dfff46ccc602875dc091.zip | |
Merge branch 'master' of ssh://sources.redhat.com/git/systemtap
Conflicts:
aclocal.m4
configure
doc/SystemTap_Tapset_Reference/Makefile.in
testsuite/aclocal.m4
testsuite/configure
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index 6891948b..91eaf4dc 100644 --- a/Makefile.in +++ b/Makefile.in @@ -427,7 +427,6 @@ LDADD = EXAMPLE_SOURCE_DIR = $(srcdir)/testsuite/systemtap.examples EXAMPLE_META_FILES = $(EXAMPLE_SOURCE_DIR)/*/*.meta TEST_COV_DIR = coverage -# XXX: leaves behind man pages SUBDIRS = doc grapher DIST_SUBDIRS = testsuite $(SUBDIRS) @@ -1816,7 +1815,6 @@ distclean-local: uninstall-local: rm -rf $(DESTDIR)$(pkgdatadir) - rm -rf $(DESTDIR)$(libexecdir)/$(PACKAGE) rm -rf $(DESTDIR)$(libdir)/$(PACKAGE) -rm -rf $(DESTDIR)$(localstatedir)/cache/$(PACKAGE) @list='$(EXAMPLE_SRC)'; for f in $$list; do p=`basename $$f`; \ @@ -1832,6 +1830,7 @@ uninstall-local: rm -f "$(SAMPLE_INSTALL_DIR)/$$p"; \ done rm -rf $(DESTDIR)$(sysconfdir)/systemtap + rm -rf $(DESTDIR)$(docdir)/examples check-local: SRCDIR=`cd $(srcdir); pwd`; \ |