diff options
| author | Greg Cox <gcox@fibbsbozza.local> | 2014-07-29 22:52:12 (GMT) |
|---|---|---|
| committer | Greg Cox <gcox@fibbsbozza.local> | 2014-07-29 22:52:12 (GMT) |
| commit | 4273dd06ff3e52094d6b267d00e8c51dd74de364 (patch) | |
| tree | 425d127da5dbec7013999ed01b469fc3f72992d9 /plugins-scripts/Makefile.am | |
| parent | f05e7016320f4671fbf86cc5abc277efea20f79e (diff) | |
| parent | 6f3d5825b203b75aef8d68bf0d117e7a1a4c0616 (diff) | |
| download | monitoring-plugins-4273dd06ff3e52094d6b267d00e8c51dd74de364.tar.gz | |
Merge remote-tracking branch 'upstream/master'refs/pull/1257/head
Conflicts:
plugins/netutils.c
Diffstat (limited to 'plugins-scripts/Makefile.am')
| -rw-r--r-- | plugins-scripts/Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins-scripts/Makefile.am b/plugins-scripts/Makefile.am index 78a950c..794a34f 100644 --- a/plugins-scripts/Makefile.am +++ b/plugins-scripts/Makefile.am | |||
| @@ -26,7 +26,8 @@ EXTRA_DIST=check_breeze.pl check_disk_smb.pl check_flexlm.pl check_ircd.pl \ | |||
| 26 | EDIT = sed \ | 26 | EDIT = sed \ |
| 27 | -e 's|[@]NP_VERSION[@]|$(NP_VERSION)|g' \ | 27 | -e 's|[@]NP_VERSION[@]|$(NP_VERSION)|g' \ |
| 28 | -e 's|[@]TRUSTED_PATH[@]|$(with_trusted_path)|g' \ | 28 | -e 's|[@]TRUSTED_PATH[@]|$(with_trusted_path)|g' \ |
| 29 | -e 's|[@]PERL[@]|$(PERL)|g' | 29 | -e 's|[@]PERL[@]|$(PERL)|g' \ |
| 30 | -e 's|[@]libexecdir[@]|$(libexecdir)|g' | ||
| 30 | 31 | ||
| 31 | TESTS_ENVIRONMENT=perl -I $(top_builddir) -I $(top_srcdir) | 32 | TESTS_ENVIRONMENT=perl -I $(top_builddir) -I $(top_srcdir) |
| 32 | 33 | ||