Fixed --help output (Ask Bjoern Hansen - #1714823)

[nagiosplug.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 7fe5447c38883e4e2caba34d4e3952b1fcab41d0..b76bf76d989e2f2f2976cbe379ed6de535b375c6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,25 +1,37 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = intl lib plugins plugins-scripts po
+SUBDIRS = gl lib plugins plugins-scripts plugins-root po
 
 EXTRA_DIST = config.rpath \
-       ABOUT-NLS CODING FAQ LEGAL REQUIREMENTS SUPPORT THANKS \
-       Helper.pm contrib pkg nagios-plugins.spec
+       ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS BUGS CODING FAQ LEGAL NEWS \
+       REQUIREMENTS SUPPORT THANKS \
+       NPTest.pm contrib pkg nagios-plugins.spec \
+       config_test/Makefile config_test/run_tests config_test/child_test.c \
+       tools/tinderbox_build
 
-ACLOCAL_AMFLAGS = -I lib
+ACLOCAL_AMFLAGS = -I gl/m4 -I m4
 
 localedir = $(datadir)/locale
 DEFS = -DLOCALEDIR=\"$(localedir)\"
 
 dist-hook:
-       make THANKS nagios-plugins.spec
+       make THANKS nagios-plugins.spec pkg/fedora/nagios-plugins.spec
+       rm -rf `find $(distdir) -name CVS`
+
+install-root:
+       cd plugins-root && $(MAKE) $@
 
 test:
+       cd lib && $(MAKE) test
        cd plugins; $(MAKE) test
        cd plugins-scripts; $(MAKE) test
 
 nagios-plugins.spec: nagios-plugins.spec.in
-       sed "s/%%{VERSION}/${VERSION}/;s/%%{RELEASE}/${RELEASE}/;" $? > $@
+       sed "s/%%{VERSION}/${VERSION}/;s/%%{RELEASE}/${RELEASE}/;s/^%%{requires}$$//" $? > $@
+
+pkg/fedora/nagios-plugins.spec: nagios-plugins.spec.in
+       $(top_srcdir)/mkinstalldirs pkg/fedora
+       sed "s/%%{VERSION}/${VERSION}/;s/%%{RELEASE}/${RELEASE}/;/^# Requires$$/r $(top_srcdir)/pkg/fedora/requires" $? > $@
 
 # Solaris pkgmk
 BUILDDIR = build-solaris
@@ -34,7 +46,7 @@ solpkg:
        $(INSTALL) pkg/solaris/pkginfo $(BUILDDIR)
        cd $(BUILDDIR) && $(PERL) ../$(PKGSCRIPT) ../$(PACKDIR)
 
-THANKS: AUTHORS
+THANKS: THANKS.in
        @echo "This software is brought to you by the Nagios Plugins Development Team. However," > $@
        @echo "there have been many contributors to this project. Everyone below has helped in " >> $@
        @echo "raising bug reports, creating patches or contributing new plugins." >> $@