Fix for regex input of '|', being output causing problems with Nagios' parsing of

[nagiosplug.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 701c56cc231ef3a874f67520b6b74a4a8db419cb..b6e5f2ec1ce1a9a770fa20c0717be94fb11e9804 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,10 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = gl lib plugins plugins-scripts plugins-root po @PERLMODS_DIR@
+SUBDIRS = gl tap lib plugins plugins-scripts plugins-root po @PERLMODS_DIR@
 
 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 \
@@ -17,16 +17,16 @@ 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) $@
 
-test:
-       cd lib && $(MAKE) test
-       if test "$(PERLMODS_DIR)" != ""; then cd perlmods && $(MAKE) test; fi
-       cd plugins && $(MAKE) test
-       cd plugins-scripts && $(MAKE) test
+test test-debug:
+       cd lib && $(MAKE) $@
+       if test "$(PERLMODS_DIR)" != ""; then cd perlmods && $(MAKE) $@; fi
+       cd plugins && $(MAKE) $@
+       cd plugins-scripts && $(MAKE) $@
 
 nagios-plugins.spec: nagios-plugins.spec.in
        sed "s/%%{VERSION}/${VERSION}/;s/%%{RELEASE}/${RELEASE}/;s/^%%{requires}$$//" $? > $@
@@ -57,3 +57,4 @@ THANKS: THANKS.in
 
 pkgclean:
        rm -rf $(BUILDDIR) $(PACKDIR)
+