tinderbox: Don't alter SunOS path if we're building off a repository tree

[nagiosplug.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 208dbbabf689eee5ddfd7f327313647fa01334d9..70325781e3c1ba77fee9a13a6b10bc7ed66459f7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,11 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = gl lib plugins plugins-scripts plugins-root po @PERLMODS_DIR@
+SUBDIRS = gl @INCLUDE_TAP_DIR@ lib plugins plugins-scripts plugins-root po @PERLMODS_DIR@
 
 # Have to list TAP_DIR manually to get in distribution
 EXTRA_DIST = config.rpath \
        ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS BUGS CODING FAQ LEGAL NEWS \
-       REQUIREMENTS SUPPORT THANKS \
+       NP-VERSION-GEN REQUIREMENTS SUPPORT THANKS \
        NPTest.pm contrib pkg nagios-plugins.spec \
        config_test/Makefile config_test/run_tests config_test/child_test.c \
        perlmods tools/build_perl_modules \
@@ -19,7 +19,7 @@ DEFS = -DLOCALEDIR=\"$(localedir)\"
 
 dist-hook:
        make THANKS nagios-plugins.spec pkg/fedora/nagios-plugins.spec
-       rm -rf `find $(distdir) -name CVS`
+       echo ${VERSION} >$(distdir)/release
 
 install-root:
        cd plugins-root && $(MAKE) $@
@@ -27,7 +27,7 @@ install-root:
 tap:
        cd @TAP_DIR@ && $(MAKE)
 
-test test-debug: tap
+test test-debug:
        cd lib && $(MAKE) $@
        if test "$(PERLMODS_DIR)" != ""; then cd perlmods && $(MAKE) $@; fi
        cd plugins && $(MAKE) $@
@@ -62,3 +62,4 @@ THANKS: THANKS.in
 
 pkgclean:
        rm -rf $(BUILDDIR) $(PACKDIR)
+