diff options
| author |  Holger Weiss <holger@zedat.fu-berlin.de>
| 2013-08-30 18:15:00 +0200 |
|---|---|---|
| committer | Holger Weiss <holger@zedat.fu-berlin.de>
| 2013-08-30 18:15:00 +0200 |
| commit | ba7615631add0b610ada6a819d6c8f8c46a2d36d (patch) | |
| tree | 9f6410f17ab1b49f64675c16b777c0e6bfb17967 /perlmods | |
| parent | 57895483731a991a9022019474cab234ba4e9818 (diff) | |
| parent | af85216c79e267b2f586064a1f7e3e01a4277d75 (diff) | |
| download | monitoring-plugins-ba7615631add0b610ada6a819d6c8f8c46a2d36d.tar.gz | |
Merge branch 'hw/update-pm'
* hw/update-pm:
Use own variable instead of ENV
Updated with last working copy of build_perl_modules used by Opsview
Conflicts:
tools/build_perl_modules
Diffstat (limited to 'perlmods')
| -rw-r--r-- | perlmods/Makefile.am | 2 | ||||
| -rw-r--r-- | perlmods/install_order | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/perlmods/Makefile.am b/perlmods/Makefile.am index 3f479f3b..14959008 100644 --- a/perlmods/Makefile.am +++ b/perlmods/Makefile.am @@ -1,7 +1,7 @@ perlmoduledir = $(exec_prefix)/perl all-local: - $(top_srcdir)/tools/build_perl_modules -d $(perlmoduledir) -m . + $(top_srcdir)/tools/build_perl_modules -d $(perlmoduledir) -em . install-exec-local: $(top_srcdir)/tools/build_perl_modules -d $(perlmoduledir) -i . diff --git a/perlmods/install_order b/perlmods/install_order index 7d84cef2..c44c8723 100644 --- a/perlmods/install_order +++ b/perlmods/install_order @@ -1,4 +1,5 @@ # Modules installed in this order +default: Test-Simple Perl-OSType Module-Implementation |