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

2 files changed, 2 insertions, 1 deletions

diff --git a/perlmods/Makefile.am b/perlmods/Makefile.am
index 3f479f3..1495900 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 7d84cef..c44c872 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