Imported Upstream version 1.5

Makefile.am

@@ -3,11 +3,11 @@
 SUBDIRS = gl tap lib plugins plugins-scripts plugins-root po @PERLMODS_DIR@
 
 EXTRA_DIST = config.rpath \
-	ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS CODING FAQ LEGAL NEWS \
+	ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog FAQ LEGAL NEWS \
 	NP-VERSION-GEN REQUIREMENTS SUPPORT THANKS \
 	NPTest.pm pkg nagios-plugins.spec \
 	config_test/Makefile config_test/run_tests config_test/child_test.c \
-	perlmods tools/build_perl_modules \
+	tools/build_perl_modules \
 	tools/tinderbox_build
 
 ACLOCAL_AMFLAGS = -I gl/m4 -I m4
@@ -15,6 +15,13 @@ ACLOCAL_AMFLAGS = -I gl/m4 -I m4
 localedir = $(datadir)/locale
 DEFS = -DLOCALEDIR=\"$(localedir)\"
 
+#
+# The ChangeLog file is auto-generated from the Git history.  We let it depend
+# on NP-VERSION-GEN, as we bump our version number in that file.
+#
+ChangeLog: NP-VERSION-GEN
+	$(top_srcdir)/tools/generate-change-log > $@
+
 dist-hook:
 	$(MAKE) THANKS
 	echo ${VERSION} >$(distdir)/release
@@ -24,7 +31,7 @@ install-root:
 
 test test-debug:
 	cd lib && $(MAKE) $@
-	if test "$(PERLMODS_DIR)" != ""; then cd perlmods && $(MAKE) $@; fi
+	if test "$(PERLMODS_DIR)" != ""; then cd && $(MAKE) $@; fi
 	cd plugins && $(MAKE) $@
 	cd plugins-scripts && $(MAKE) $@