Fixed (hopefully) issue where perl libraries were installed in odd place
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2932 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
parent
d529a079df
commit
e977aaa71c
|
@ -331,9 +331,12 @@ if test "$prefix" != "NONE"; then
|
||||||
PERL_SITE_LIB=`perl -V:installsitelib | sed -e "s/.*='\(.*\)';/\1/"`
|
PERL_SITE_LIB=`perl -V:installsitelib | sed -e "s/.*='\(.*\)';/\1/"`
|
||||||
PERL_LIB_PATH=`echo $PERL_SITE_LIB | sed -e "s|^$PERL_PREFIX||"`
|
PERL_LIB_PATH=`echo $PERL_SITE_LIB | sed -e "s|^$PERL_PREFIX||"`
|
||||||
EXTRA_PERL_LIB="use lib '$prefix$PERL_LIB_PATH'; # Include custom perl install path"
|
EXTRA_PERL_LIB="use lib '$prefix$PERL_LIB_PATH'; # Include custom perl install path"
|
||||||
|
PERL_MM_PARMS="PREFIX=$prefix"
|
||||||
else
|
else
|
||||||
EXTRA_PERL_LIB="# Include from system perl paths only"
|
EXTRA_PERL_LIB="# Include from system perl paths only"
|
||||||
|
PERL_MM_PARMS=
|
||||||
fi
|
fi
|
||||||
|
AC_SUBST(PERL_MM_PARMS)
|
||||||
AC_SUBST(EXTRA_PERL_LIB)
|
AC_SUBST(EXTRA_PERL_LIB)
|
||||||
|
|
||||||
AC_CONFIG_FILES([Makefile
|
AC_CONFIG_FILES([Makefile
|
||||||
|
@ -397,4 +400,5 @@ AC_OUTPUT
|
||||||
|
|
||||||
#AC_CHECK_FILE(scripts/ZoneMinder/Makefile,,[cd scripts/ZoneMinder;perl Makefile.PL PREFIX=$PREFIX])
|
#AC_CHECK_FILE(scripts/ZoneMinder/Makefile,,[cd scripts/ZoneMinder;perl Makefile.PL PREFIX=$PREFIX])
|
||||||
cd scripts/ZoneMinder
|
cd scripts/ZoneMinder
|
||||||
perl Makefile.PL PREFIX=$prefix
|
echo "perl Makefile.PL $PERL_MM_PARMS"
|
||||||
|
perl Makefile.PL $PERL_MM_PARMS
|
||||||
|
|
Loading…
Reference in New Issue