summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Wielaard <mjw@redhat.com>2009-05-08 10:30:41 +0200
committerMark Wielaard <mjw@redhat.com>2009-05-08 10:30:41 +0200
commit532a25e60429f12cb92ef1056f1454815d135322 (patch)
tree153f817e02dfe3ca10691dedbbb6f0fd7a6dfe0d
parent7b32c0d6ab200d270a94b1db5714e3a0507f9b20 (diff)
downloadsystemtap-steved-532a25e60429f12cb92ef1056f1454815d135322.tar.gz
systemtap-steved-532a25e60429f12cb92ef1056f1454815d135322.tar.xz
systemtap-steved-532a25e60429f12cb92ef1056f1454815d135322.zip
Search for only under $(SRCDIR)/tapsets for tapsets.xml and cleanup.
* doc/SystemTap_Tapset_Reference/Makefile.am (tapsets.xml): Only search under $(SRCDIR)/tapsets for .stp files. Cleanup tapsets.xml.new. * doc/SystemTap_Tapset_Reference/Makefile.in: Regenerated.
-rw-r--r--doc/SystemTap_Tapset_Reference/Makefile.am3
-rw-r--r--doc/SystemTap_Tapset_Reference/Makefile.in3
2 files changed, 4 insertions, 2 deletions
diff --git a/doc/SystemTap_Tapset_Reference/Makefile.am b/doc/SystemTap_Tapset_Reference/Makefile.am
index a191461a..30c4ffef 100644
--- a/doc/SystemTap_Tapset_Reference/Makefile.am
+++ b/doc/SystemTap_Tapset_Reference/Makefile.am
@@ -24,10 +24,11 @@ endif
if BUILD_REFDOCS
all: $(PDFDOCS) stamp-htmldocs stamp-mandocs
-tapsets.xml: docproc $(shell find $(SRCTREE) -name '*.stp')
+tapsets.xml: docproc $(shell find $(SRCTREE)/tapset -name '*.stp')
SRCTREE=$(SRCTREE) $(DOCPROC) doc $(abs_srcdir)/tapsets.tmpl > tapsets.xml.new
if cmp tapsets.xml.new tapsets.xml >/dev/null ; then \
echo tapsets.xml unchanged; \
+ rm tapsets.xml.new; \
else \
mv tapsets.xml.new tapsets.xml; \
fi
diff --git a/doc/SystemTap_Tapset_Reference/Makefile.in b/doc/SystemTap_Tapset_Reference/Makefile.in
index 7a5f0fe0..ee7bb06c 100644
--- a/doc/SystemTap_Tapset_Reference/Makefile.in
+++ b/doc/SystemTap_Tapset_Reference/Makefile.in
@@ -418,10 +418,11 @@ uninstall-am:
@BUILD_REFDOCS_TRUE@all: $(PDFDOCS) stamp-htmldocs stamp-mandocs
-@BUILD_REFDOCS_TRUE@tapsets.xml: docproc $(shell find $(SRCTREE) -name '*.stp')
+@BUILD_REFDOCS_TRUE@tapsets.xml: docproc $(shell find $(SRCTREE)/tapset -name '*.stp')
@BUILD_REFDOCS_TRUE@ SRCTREE=$(SRCTREE) $(DOCPROC) doc $(abs_srcdir)/tapsets.tmpl > tapsets.xml.new
@BUILD_REFDOCS_TRUE@ if cmp tapsets.xml.new tapsets.xml >/dev/null ; then \
@BUILD_REFDOCS_TRUE@ echo tapsets.xml unchanged; \
+@BUILD_REFDOCS_TRUE@ rm tapsets.xml.new; \
@BUILD_REFDOCS_TRUE@ else \
@BUILD_REFDOCS_TRUE@ mv tapsets.xml.new tapsets.xml; \
@BUILD_REFDOCS_TRUE@ fi