ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'plugin_support_basic' into plugin_support 

Conflicts:
	distros/debian8/zoneminder.dirs
This commit is contained in:
Emmanuel Papin 2015-01-01 19:13:53 +01:00
parent d070b36aec ee259be366
commit cdfb4b4bb5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -550,10 +550,10 @@ 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_SITE_PREFIX||"` PERL_LIB_PATH=`echo $PERL_SITE_LIB | sed -e "s|^$PERL_SITE_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 INSTALLDIRS=vendor\"" 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="\"INSTALLDIRS=vendor\"" PERL_MM_PARMS=
fi fi
AC_SUBST(PERL_MM_PARMS) AC_SUBST(PERL_MM_PARMS)
AC_SUBST(EXTRA_PERL_LIB) AC_SUBST(EXTRA_PERL_LIB)