From 11a1cc2d4195b25e2c74b2aefdbe0bf5ccab673c Mon Sep 17 00:00:00 2001 From: stan Date: Mon, 8 Jun 2009 09:11:56 +0000 Subject: [PATCH] Now supports custom perl install path git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2908 e3e1d417-86f3-4887-817a-d78f3d33393f --- Makefile.in | 1 + configure | 53 ++++++++++++----------- configure.ac | 26 ++++++++++- db/Makefile.in | 1 + scripts/Makefile.in | 38 ++++++++++++++-- scripts/{zmaudit.pl => zmaudit.pl.in} | 1 + scripts/{zmcontrol.pl => zmcontrol.pl.in} | 1 + scripts/{zmdc.pl => zmdc.pl.in} | 1 + scripts/{zmfilter.pl => zmfilter.pl.in} | 1 + scripts/{zmpkg.pl => zmpkg.pl.in} | 1 + scripts/{zmtrack.pl => zmtack.pl.in} | 0 scripts/{zmtrigger.pl => zmtrigger.pl.in} | 8 ++++ scripts/{zmupdate.pl => zmupdate.pl.in} | 1 + scripts/{zmvideo.pl => zmvideo.pl.in} | 1 + scripts/{zmwatch.pl => zmwatch.pl.in} | 1 + scripts/{zmx10.pl => zmx10.pl.in} | 1 + src/Makefile.in | 1 + web/Makefile.in | 1 + web/ajax/Makefile.in | 1 + web/css/Makefile.in | 1 + web/graphics/Makefile.in | 1 + web/includes/Makefile.in | 1 + web/js/Makefile.in | 1 + web/lang/Makefile.in | 1 + web/skins/Makefile.in | 1 + web/skins/classic/Makefile.in | 1 + web/skins/classic/ajax/Makefile.in | 1 + web/skins/classic/css/Makefile.in | 1 + web/skins/classic/graphics/Makefile.in | 1 + web/skins/classic/includes/Makefile.in | 1 + web/skins/classic/js/Makefile.in | 1 + web/skins/classic/lang/Makefile.in | 1 + web/skins/classic/views/Makefile.in | 1 + web/skins/classic/views/css/Makefile.in | 1 + web/skins/classic/views/js/Makefile.in | 1 + web/skins/mobile/Makefile.in | 1 + web/skins/mobile/ajax/Makefile.in | 1 + web/skins/mobile/css/Makefile.in | 1 + web/skins/mobile/graphics/Makefile.in | 1 + web/skins/mobile/includes/Makefile.in | 1 + web/skins/mobile/lang/Makefile.in | 1 + web/skins/mobile/views/Makefile.in | 1 + web/skins/mobile/views/css/Makefile.in | 1 + web/tools/Makefile.in | 1 + web/tools/mootools/Makefile.in | 1 + web/views/Makefile.in | 1 + 46 files changed, 136 insertions(+), 30 deletions(-) rename scripts/{zmaudit.pl => zmaudit.pl.in} (99%) rename scripts/{zmcontrol.pl => zmcontrol.pl.in} (99%) rename scripts/{zmdc.pl => zmdc.pl.in} (99%) rename scripts/{zmfilter.pl => zmfilter.pl.in} (99%) rename scripts/{zmpkg.pl => zmpkg.pl.in} (99%) rename scripts/{zmtrack.pl => zmtack.pl.in} (100%) rename scripts/{zmtrigger.pl => zmtrigger.pl.in} (97%) rename scripts/{zmupdate.pl => zmupdate.pl.in} (99%) rename scripts/{zmvideo.pl => zmvideo.pl.in} (99%) rename scripts/{zmwatch.pl => zmwatch.pl.in} (99%) rename scripts/{zmx10.pl => zmx10.pl.in} (99%) diff --git a/Makefile.in b/Makefile.in index aa4648fd6..3a4b34a94 100644 --- a/Makefile.in +++ b/Makefile.in @@ -117,6 +117,7 @@ EGREP = @EGREP@ ENABLE_MMAP = @ENABLE_MMAP@ EXEEXT = @EXEEXT@ EXTRA_LIBS = @EXTRA_LIBS@ +EXTRA_PERL_LIB = @EXTRA_PERL_LIB@ FFMPEG_CFLAGS = @FFMPEG_CFLAGS@ FFMPEG_LIBS = @FFMPEG_LIBS@ FFMPEG_PREFIX = @FFMPEG_PREFIX@ diff --git a/configure b/configure index c4ede7bb2..b09c60b09 100755 --- a/configure +++ b/configure @@ -311,7 +311,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar PATH_BUILD TIME_BUILD ZM_DB_HOST ZM_DB_NAME ZM_DB_USER ZM_DB_PASS ZM_SSL_LIB ZM_MYSQL_ENGINE LIB_ARCH MYSQL_PREFIX MYSQL_LIBS MYSQL_CFLAGS FFMPEG_PREFIX FFMPEG_LIBS FFMPEG_CFLAGS EXTRA_LIBS WEB_PREFIX CGI_PREFIX WEB_USER WEB_GROUP ENABLE_MMAP CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S RANLIB ac_ct_RANLIB CXXCPP EGREP LIBOBJS POW_LIB OPT_FFMPEG PATH_FFMPEG OPT_NETPBM PATH_NETPBM ALLOCA ZM_V4L2 ZM_PCRE PERL BINDIR LIBDIR RUNDIR ZM_RUNDIR ZM_PID SYSCONFDIR ZM_CONFIG LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar PATH_BUILD TIME_BUILD ZM_DB_HOST ZM_DB_NAME ZM_DB_USER ZM_DB_PASS ZM_SSL_LIB ZM_MYSQL_ENGINE LIB_ARCH MYSQL_PREFIX MYSQL_LIBS MYSQL_CFLAGS FFMPEG_PREFIX FFMPEG_LIBS FFMPEG_CFLAGS EXTRA_LIBS WEB_PREFIX CGI_PREFIX WEB_USER WEB_GROUP ENABLE_MMAP CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S RANLIB ac_ct_RANLIB CXXCPP EGREP LIBOBJS POW_LIB OPT_FFMPEG PATH_FFMPEG OPT_NETPBM PATH_NETPBM ALLOCA ZM_V4L2 ZM_PCRE PERL BINDIR LIBDIR RUNDIR ZM_RUNDIR ZM_PID SYSCONFDIR ZM_CONFIG EXTRA_PERL_LIB LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -13517,7 +13517,18 @@ _ACEOF ZM_CONFIG="$SYSCONFDIR/zm.conf" - ac_config_files="$ac_config_files Makefile zm.conf db/Makefile db/zm_create.sql scripts/Makefile scripts/zm scripts/zmdbbackup scripts/zmdbrestore scripts/zmeventdump scripts/zmlogrotate.conf scripts/ZoneMinder/lib/ZoneMinder/Base.pm scripts/ZoneMinder/lib/ZoneMinder/Config.pm scripts/ZoneMinder/lib/ZoneMinder/Memory.pm scripts/ZoneMinder/lib/ZoneMinder/ConfigAdmin.pm src/Makefile src/zm_config.h web/Makefile web/ajax/Makefile web/css/Makefile web/graphics/Makefile web/includes/Makefile web/includes/config.php web/js/Makefile web/lang/Makefile web/skins/Makefile web/skins/classic/Makefile web/skins/classic/ajax/Makefile web/skins/classic/css/Makefile web/skins/classic/graphics/Makefile web/skins/classic/includes/Makefile web/skins/classic/js/Makefile web/skins/classic/lang/Makefile web/skins/classic/views/Makefile web/skins/classic/views/css/Makefile web/skins/classic/views/js/Makefile web/skins/mobile/Makefile web/skins/mobile/ajax/Makefile web/skins/mobile/css/Makefile web/skins/mobile/graphics/Makefile web/skins/mobile/includes/Makefile web/skins/mobile/lang/Makefile web/skins/mobile/views/Makefile web/skins/mobile/views/css/Makefile web/tools/Makefile web/tools/mootools/Makefile web/views/Makefile" +# Slight hack for non-standard perl install paths +if test "$prefix" != "NONE"; then + PERL_PREFIX=`perl -V:installprefix | 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||"` + EXTRA_PERL_LIB="use lib '$prefix$PERL_LIB_PATH'; # Include custom perl install path" +else + EXTRA_PERL_LIB="# Include from system perl paths only" +fi + + + ac_config_files="$ac_config_files Makefile zm.conf db/Makefile db/zm_create.sql scripts/Makefile scripts/zm scripts/zmaudit.pl scripts/zmcontrol.pl scripts/zmdc.pl scripts/zmfilter.pl scripts/zmpkg.pl scripts/zmtrack.pl scripts/zmtrigger.pl scripts/zmupdate.pl scripts/zmvideo.pl scripts/zmwatch.pl scripts/zmx10.pl scripts/zmdbbackup scripts/zmdbrestore scripts/zmeventdump scripts/zmlogrotate.conf scripts/ZoneMinder/lib/ZoneMinder/Base.pm scripts/ZoneMinder/lib/ZoneMinder/Config.pm scripts/ZoneMinder/lib/ZoneMinder/Memory.pm scripts/ZoneMinder/lib/ZoneMinder/ConfigAdmin.pm src/Makefile src/zm_config.h web/Makefile web/ajax/Makefile web/css/Makefile web/graphics/Makefile web/includes/Makefile web/includes/config.php web/js/Makefile web/lang/Makefile web/skins/Makefile web/skins/classic/Makefile web/skins/classic/ajax/Makefile web/skins/classic/css/Makefile web/skins/classic/graphics/Makefile web/skins/classic/includes/Makefile web/skins/classic/js/Makefile web/skins/classic/lang/Makefile web/skins/classic/views/Makefile web/skins/classic/views/css/Makefile web/skins/classic/views/js/Makefile web/skins/mobile/Makefile web/skins/mobile/ajax/Makefile web/skins/mobile/css/Makefile web/skins/mobile/graphics/Makefile web/skins/mobile/includes/Makefile web/skins/mobile/lang/Makefile web/skins/mobile/views/Makefile web/skins/mobile/views/css/Makefile web/tools/Makefile web/tools/mootools/Makefile web/views/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -14081,6 +14092,17 @@ do "db/zm_create.sql" ) CONFIG_FILES="$CONFIG_FILES db/zm_create.sql" ;; "scripts/Makefile" ) CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;; "scripts/zm" ) CONFIG_FILES="$CONFIG_FILES scripts/zm" ;; + "scripts/zmaudit.pl" ) CONFIG_FILES="$CONFIG_FILES scripts/zmaudit.pl" ;; + "scripts/zmcontrol.pl" ) CONFIG_FILES="$CONFIG_FILES scripts/zmcontrol.pl" ;; + "scripts/zmdc.pl" ) CONFIG_FILES="$CONFIG_FILES scripts/zmdc.pl" ;; + "scripts/zmfilter.pl" ) CONFIG_FILES="$CONFIG_FILES scripts/zmfilter.pl" ;; + "scripts/zmpkg.pl" ) CONFIG_FILES="$CONFIG_FILES scripts/zmpkg.pl" ;; + "scripts/zmtrack.pl" ) CONFIG_FILES="$CONFIG_FILES scripts/zmtrack.pl" ;; + "scripts/zmtrigger.pl" ) CONFIG_FILES="$CONFIG_FILES scripts/zmtrigger.pl" ;; + "scripts/zmupdate.pl" ) CONFIG_FILES="$CONFIG_FILES scripts/zmupdate.pl" ;; + "scripts/zmvideo.pl" ) CONFIG_FILES="$CONFIG_FILES scripts/zmvideo.pl" ;; + "scripts/zmwatch.pl" ) CONFIG_FILES="$CONFIG_FILES scripts/zmwatch.pl" ;; + "scripts/zmx10.pl" ) CONFIG_FILES="$CONFIG_FILES scripts/zmx10.pl" ;; "scripts/zmdbbackup" ) CONFIG_FILES="$CONFIG_FILES scripts/zmdbbackup" ;; "scripts/zmdbrestore" ) CONFIG_FILES="$CONFIG_FILES scripts/zmdbrestore" ;; "scripts/zmeventdump" ) CONFIG_FILES="$CONFIG_FILES scripts/zmeventdump" ;; @@ -14295,6 +14317,7 @@ s,@ZM_RUNDIR@,$ZM_RUNDIR,;t t s,@ZM_PID@,$ZM_PID,;t t s,@SYSCONFDIR@,$SYSCONFDIR,;t t s,@ZM_CONFIG@,$ZM_CONFIG,;t t +s,@EXTRA_PERL_LIB@,$EXTRA_PERL_LIB,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF @@ -15012,26 +15035,6 @@ if test "$no_create" != yes; then fi -echo "$as_me:$LINENO: checking for scripts/ZoneMinder/Makefile" >&5 -echo $ECHO_N "checking for scripts/ZoneMinder/Makefile... $ECHO_C" >&6 -if test "${ac_cv_file_scripts_ZoneMinder_Makefile+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} - { (exit 1); exit 1; }; } -if test -r "scripts/ZoneMinder/Makefile"; then - ac_cv_file_scripts_ZoneMinder_Makefile=yes -else - ac_cv_file_scripts_ZoneMinder_Makefile=no -fi -fi -echo "$as_me:$LINENO: result: $ac_cv_file_scripts_ZoneMinder_Makefile" >&5 -echo "${ECHO_T}$ac_cv_file_scripts_ZoneMinder_Makefile" >&6 -if test $ac_cv_file_scripts_ZoneMinder_Makefile = yes; then - : -else - cd scripts/ZoneMinder;perl Makefile.PL -fi - +#AC_CHECK_FILE(scripts/ZoneMinder/Makefile,,[cd scripts/ZoneMinder;perl Makefile.PL PREFIX=$PREFIX]) +cd scripts/ZoneMinder +perl Makefile.PL PREFIX=$prefix diff --git a/configure.ac b/configure.ac index 92adca02b..fea75f8b9 100644 --- a/configure.ac +++ b/configure.ac @@ -325,12 +325,34 @@ AC_SUBST(ZM_PID,"$ZM_RUNDIR/zm.pid") AC_DEFINE_DIR([SYSCONFDIR],[sysconfdir],[Expanded configuration directory]) AC_SUBST(ZM_CONFIG,"$SYSCONFDIR/zm.conf") +# Slight hack for non-standard perl install paths +if test "$prefix" != "NONE"; then + PERL_PREFIX=`perl -V:installprefix | 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||"` + EXTRA_PERL_LIB="use lib '$prefix$PERL_LIB_PATH'; # Include custom perl install path" +else + EXTRA_PERL_LIB="# Include from system perl paths only" +fi +AC_SUBST(EXTRA_PERL_LIB) + AC_CONFIG_FILES([Makefile zm.conf db/Makefile db/zm_create.sql scripts/Makefile scripts/zm + scripts/zmaudit.pl + scripts/zmcontrol.pl + scripts/zmdc.pl + scripts/zmfilter.pl + scripts/zmpkg.pl + scripts/zmtrack.pl + scripts/zmtrigger.pl + scripts/zmupdate.pl + scripts/zmvideo.pl + scripts/zmwatch.pl + scripts/zmx10.pl scripts/zmdbbackup scripts/zmdbrestore scripts/zmeventdump @@ -373,4 +395,6 @@ AC_CONFIG_FILES([Makefile web/views/Makefile]) AC_OUTPUT -AC_CHECK_FILE(scripts/ZoneMinder/Makefile,,[cd scripts/ZoneMinder;perl Makefile.PL]) +#AC_CHECK_FILE(scripts/ZoneMinder/Makefile,,[cd scripts/ZoneMinder;perl Makefile.PL PREFIX=$PREFIX]) +cd scripts/ZoneMinder +perl Makefile.PL PREFIX=$prefix diff --git a/db/Makefile.in b/db/Makefile.in index 0f97a6b76..26621b5d1 100644 --- a/db/Makefile.in +++ b/db/Makefile.in @@ -76,6 +76,7 @@ EGREP = @EGREP@ ENABLE_MMAP = @ENABLE_MMAP@ EXEEXT = @EXEEXT@ EXTRA_LIBS = @EXTRA_LIBS@ +EXTRA_PERL_LIB = @EXTRA_PERL_LIB@ FFMPEG_CFLAGS = @FFMPEG_CFLAGS@ FFMPEG_LIBS = @FFMPEG_LIBS@ FFMPEG_PREFIX = @FFMPEG_PREFIX@ diff --git a/scripts/Makefile.in b/scripts/Makefile.in index 310a90558..fa79f675b 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -36,9 +36,14 @@ PRE_UNINSTALL = : POST_UNINSTALL = : subdir = scripts DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/zm.in $(srcdir)/zmdbbackup.in \ - $(srcdir)/zmdbrestore.in $(srcdir)/zmeventdump.in \ - $(srcdir)/zmlogrotate.conf.in + $(srcdir)/zm.in $(srcdir)/zmaudit.pl.in \ + $(srcdir)/zmcontrol.pl.in $(srcdir)/zmdbbackup.in \ + $(srcdir)/zmdbrestore.in $(srcdir)/zmdc.pl.in \ + $(srcdir)/zmeventdump.in $(srcdir)/zmfilter.pl.in \ + $(srcdir)/zmlogrotate.conf.in $(srcdir)/zmpkg.pl.in \ + $(srcdir)/zmtrack.pl.in $(srcdir)/zmtrigger.pl.in \ + $(srcdir)/zmupdate.pl.in $(srcdir)/zmvideo.pl.in \ + $(srcdir)/zmwatch.pl.in $(srcdir)/zmx10.pl.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac @@ -46,7 +51,9 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = zm zmdbbackup zmdbrestore zmeventdump \ +CONFIG_CLEAN_FILES = zm zmaudit.pl zmcontrol.pl zmdc.pl zmfilter.pl \ + zmpkg.pl zmtrack.pl zmtrigger.pl zmupdate.pl zmvideo.pl \ + zmwatch.pl zmx10.pl zmdbbackup zmdbrestore zmeventdump \ zmlogrotate.conf am__installdirs = "$(DESTDIR)$(bindir)" binSCRIPT_INSTALL = $(INSTALL_SCRIPT) @@ -92,6 +99,7 @@ EGREP = @EGREP@ ENABLE_MMAP = @ENABLE_MMAP@ EXEEXT = @EXEEXT@ EXTRA_LIBS = @EXTRA_LIBS@ +EXTRA_PERL_LIB = @EXTRA_PERL_LIB@ FFMPEG_CFLAGS = @FFMPEG_CFLAGS@ FFMPEG_LIBS = @FFMPEG_LIBS@ FFMPEG_PREFIX = @FFMPEG_PREFIX@ @@ -282,6 +290,28 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh zm: $(top_builddir)/config.status $(srcdir)/zm.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +zmaudit.pl: $(top_builddir)/config.status $(srcdir)/zmaudit.pl.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +zmcontrol.pl: $(top_builddir)/config.status $(srcdir)/zmcontrol.pl.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +zmdc.pl: $(top_builddir)/config.status $(srcdir)/zmdc.pl.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +zmfilter.pl: $(top_builddir)/config.status $(srcdir)/zmfilter.pl.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +zmpkg.pl: $(top_builddir)/config.status $(srcdir)/zmpkg.pl.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +zmtrack.pl: $(top_builddir)/config.status $(srcdir)/zmtrack.pl.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +zmtrigger.pl: $(top_builddir)/config.status $(srcdir)/zmtrigger.pl.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +zmupdate.pl: $(top_builddir)/config.status $(srcdir)/zmupdate.pl.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +zmvideo.pl: $(top_builddir)/config.status $(srcdir)/zmvideo.pl.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +zmwatch.pl: $(top_builddir)/config.status $(srcdir)/zmwatch.pl.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +zmx10.pl: $(top_builddir)/config.status $(srcdir)/zmx10.pl.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ zmdbbackup: $(top_builddir)/config.status $(srcdir)/zmdbbackup.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ zmdbrestore: $(top_builddir)/config.status $(srcdir)/zmdbrestore.in diff --git a/scripts/zmaudit.pl b/scripts/zmaudit.pl.in similarity index 99% rename from scripts/zmaudit.pl rename to scripts/zmaudit.pl.in index 694ea48c6..fa724aaab 100644 --- a/scripts/zmaudit.pl +++ b/scripts/zmaudit.pl.in @@ -52,6 +52,7 @@ use constant DBG_LEVEL => 0; # 0 is errors, warnings and info only, > 0 for debu # # ========================================================================== +@EXTRA_PERL_LIB@ use ZoneMinder; use DBI; use POSIX; diff --git a/scripts/zmcontrol.pl b/scripts/zmcontrol.pl.in similarity index 99% rename from scripts/zmcontrol.pl rename to scripts/zmcontrol.pl.in index 249551d82..8a28377e6 100644 --- a/scripts/zmcontrol.pl +++ b/scripts/zmcontrol.pl.in @@ -38,6 +38,7 @@ use constant DBG_LEVEL => 0; # 0 is errors, warnings and info only, > 0 for debu # ========================================================================== +@EXTRA_PERL_LIB@ use ZoneMinder; use Getopt::Long; use POSIX qw/strftime EPIPE/; diff --git a/scripts/zmdc.pl b/scripts/zmdc.pl.in similarity index 99% rename from scripts/zmdc.pl rename to scripts/zmdc.pl.in index c2a705e96..bf4235392 100644 --- a/scripts/zmdc.pl +++ b/scripts/zmdc.pl.in @@ -47,6 +47,7 @@ use constant MAX_CONNECT_DELAY => 10; # # ========================================================================== +@EXTRA_PERL_LIB@ use ZoneMinder; use POSIX; use Socket; diff --git a/scripts/zmfilter.pl b/scripts/zmfilter.pl.in similarity index 99% rename from scripts/zmfilter.pl rename to scripts/zmfilter.pl.in index a5413f8fe..5eaabefc3 100644 --- a/scripts/zmfilter.pl +++ b/scripts/zmfilter.pl.in @@ -45,6 +45,7 @@ use constant START_DELAY => 5; # How long to wait before starting # # ========================================================================== +@EXTRA_PERL_LIB@ use ZoneMinder; use DBI; use POSIX; diff --git a/scripts/zmpkg.pl b/scripts/zmpkg.pl.in similarity index 99% rename from scripts/zmpkg.pl rename to scripts/zmpkg.pl.in index b961a6bdc..39fe698a4 100644 --- a/scripts/zmpkg.pl +++ b/scripts/zmpkg.pl.in @@ -42,6 +42,7 @@ use constant DBG_LEVEL => 0; # 0 is errors, warnings and info only, > 0 for debu # # ========================================================================== +@EXTRA_PERL_LIB@ use ZoneMinder; use DBI; use POSIX; diff --git a/scripts/zmtrack.pl b/scripts/zmtack.pl.in similarity index 100% rename from scripts/zmtrack.pl rename to scripts/zmtack.pl.in diff --git a/scripts/zmtrigger.pl b/scripts/zmtrigger.pl.in similarity index 97% rename from scripts/zmtrigger.pl rename to scripts/zmtrigger.pl.in index 90aaed863..abf8ef7ad 100644 --- a/scripts/zmtrigger.pl +++ b/scripts/zmtrigger.pl.in @@ -24,6 +24,7 @@ # This script is used to trigger and cancel alarms from external connections # using an arbitrary text based format # +# ========================================================================== use strict; use bytes; @@ -40,6 +41,13 @@ use constant MAX_CONNECT_DELAY => 10; use constant MONITOR_RELOAD_INTERVAL => 300; use constant SELECT_TIMEOUT => 0.25; +# ========================================================================== +# +# Channel/Connection Modules +# +# ========================================================================== + +@EXTRA_PERL_LIB@ use ZoneMinder::Trigger::Channel::Inet; use ZoneMinder::Trigger::Channel::Unix; use ZoneMinder::Trigger::Channel::Serial; diff --git a/scripts/zmupdate.pl b/scripts/zmupdate.pl.in similarity index 99% rename from scripts/zmupdate.pl rename to scripts/zmupdate.pl.in index f5e74e7e0..7036ebc12 100644 --- a/scripts/zmupdate.pl +++ b/scripts/zmupdate.pl.in @@ -45,6 +45,7 @@ use constant CHECK_INTERVAL => (1*24*60*60); # Interval between version checks # # ========================================================================== +@EXTRA_PERL_LIB@ use ZoneMinder::Base qw(:all); use ZoneMinder::Config qw(:all); use ZoneMinder::Debug qw(:all); diff --git a/scripts/zmvideo.pl b/scripts/zmvideo.pl.in similarity index 99% rename from scripts/zmvideo.pl rename to scripts/zmvideo.pl.in index 3fa9ce06f..1504e97ab 100644 --- a/scripts/zmvideo.pl +++ b/scripts/zmvideo.pl.in @@ -42,6 +42,7 @@ use constant DBG_LEVEL => 0; # 0 is errors, warnings and info only, > 0 for debu # # ========================================================================== +@EXTRA_PERL_LIB@ use ZoneMinder; use DBI; use Data::Dumper; diff --git a/scripts/zmwatch.pl b/scripts/zmwatch.pl.in similarity index 99% rename from scripts/zmwatch.pl rename to scripts/zmwatch.pl.in index a05e21581..95f6e8fbb 100644 --- a/scripts/zmwatch.pl +++ b/scripts/zmwatch.pl.in @@ -45,6 +45,7 @@ use constant START_DELAY => 30; # To give everything else time to start # # ========================================================================== +@EXTRA_PERL_LIB@ use ZoneMinder; use POSIX; use DBI; diff --git a/scripts/zmx10.pl b/scripts/zmx10.pl.in similarity index 99% rename from scripts/zmx10.pl rename to scripts/zmx10.pl.in index 01beb62fd..fd85a1e0a 100644 --- a/scripts/zmx10.pl +++ b/scripts/zmx10.pl.in @@ -44,6 +44,7 @@ use constant CAUSE_STRING => "X10"; # What gets written as the cause of any even # # ========================================================================== +@EXTRA_PERL_LIB@ use ZoneMinder; use POSIX; use Socket; diff --git a/src/Makefile.in b/src/Makefile.in index 33969506c..3034b4f5e 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -135,6 +135,7 @@ EGREP = @EGREP@ ENABLE_MMAP = @ENABLE_MMAP@ EXEEXT = @EXEEXT@ EXTRA_LIBS = @EXTRA_LIBS@ +EXTRA_PERL_LIB = @EXTRA_PERL_LIB@ FFMPEG_CFLAGS = @FFMPEG_CFLAGS@ FFMPEG_LIBS = @FFMPEG_LIBS@ FFMPEG_PREFIX = @FFMPEG_PREFIX@ diff --git a/web/Makefile.in b/web/Makefile.in index e8359f305..3c44acca4 100644 --- a/web/Makefile.in +++ b/web/Makefile.in @@ -95,6 +95,7 @@ EGREP = @EGREP@ ENABLE_MMAP = @ENABLE_MMAP@ EXEEXT = @EXEEXT@ EXTRA_LIBS = @EXTRA_LIBS@ +EXTRA_PERL_LIB = @EXTRA_PERL_LIB@ FFMPEG_CFLAGS = @FFMPEG_CFLAGS@ FFMPEG_LIBS = @FFMPEG_LIBS@ FFMPEG_PREFIX = @FFMPEG_PREFIX@ diff --git a/web/ajax/Makefile.in b/web/ajax/Makefile.in index 8c3917867..da0d80b07 100644 --- a/web/ajax/Makefile.in +++ b/web/ajax/Makefile.in @@ -86,6 +86,7 @@ EGREP = @EGREP@ ENABLE_MMAP = @ENABLE_MMAP@ EXEEXT = @EXEEXT@ EXTRA_LIBS = @EXTRA_LIBS@ +EXTRA_PERL_LIB = @EXTRA_PERL_LIB@ FFMPEG_CFLAGS = @FFMPEG_CFLAGS@ FFMPEG_LIBS = @FFMPEG_LIBS@ FFMPEG_PREFIX = @FFMPEG_PREFIX@ diff --git a/web/css/Makefile.in b/web/css/Makefile.in index d4763d27e..8c3751a6c 100644 --- a/web/css/Makefile.in +++ b/web/css/Makefile.in @@ -86,6 +86,7 @@ EGREP = @EGREP@ ENABLE_MMAP = @ENABLE_MMAP@ EXEEXT = @EXEEXT@ EXTRA_LIBS = @EXTRA_LIBS@ +EXTRA_PERL_LIB = @EXTRA_PERL_LIB@ FFMPEG_CFLAGS = @FFMPEG_CFLAGS@ FFMPEG_LIBS = @FFMPEG_LIBS@ FFMPEG_PREFIX = @FFMPEG_PREFIX@ diff --git a/web/graphics/Makefile.in b/web/graphics/Makefile.in index c20043276..a5f9ed0ba 100644 --- a/web/graphics/Makefile.in +++ b/web/graphics/Makefile.in @@ -86,6 +86,7 @@ EGREP = @EGREP@ ENABLE_MMAP = @ENABLE_MMAP@ EXEEXT = @EXEEXT@ EXTRA_LIBS = @EXTRA_LIBS@ +EXTRA_PERL_LIB = @EXTRA_PERL_LIB@ FFMPEG_CFLAGS = @FFMPEG_CFLAGS@ FFMPEG_LIBS = @FFMPEG_LIBS@ FFMPEG_PREFIX = @FFMPEG_PREFIX@ diff --git a/web/includes/Makefile.in b/web/includes/Makefile.in index ef2313e51..0d2d8fe10 100644 --- a/web/includes/Makefile.in +++ b/web/includes/Makefile.in @@ -86,6 +86,7 @@ EGREP = @EGREP@ ENABLE_MMAP = @ENABLE_MMAP@ EXEEXT = @EXEEXT@ EXTRA_LIBS = @EXTRA_LIBS@ +EXTRA_PERL_LIB = @EXTRA_PERL_LIB@ FFMPEG_CFLAGS = @FFMPEG_CFLAGS@ FFMPEG_LIBS = @FFMPEG_LIBS@ FFMPEG_PREFIX = @FFMPEG_PREFIX@ diff --git a/web/js/Makefile.in b/web/js/Makefile.in index 944aba783..49bcdc3eb 100644 --- a/web/js/Makefile.in +++ b/web/js/Makefile.in @@ -86,6 +86,7 @@ EGREP = @EGREP@ ENABLE_MMAP = @ENABLE_MMAP@ EXEEXT = @EXEEXT@ EXTRA_LIBS = @EXTRA_LIBS@ +EXTRA_PERL_LIB = @EXTRA_PERL_LIB@ FFMPEG_CFLAGS = @FFMPEG_CFLAGS@ FFMPEG_LIBS = @FFMPEG_LIBS@ FFMPEG_PREFIX = @FFMPEG_PREFIX@ diff --git a/web/lang/Makefile.in b/web/lang/Makefile.in index e30bda8cc..9ce33573b 100644 --- a/web/lang/Makefile.in +++ b/web/lang/Makefile.in @@ -86,6 +86,7 @@ EGREP = @EGREP@ ENABLE_MMAP = @ENABLE_MMAP@ EXEEXT = @EXEEXT@ EXTRA_LIBS = @EXTRA_LIBS@ +EXTRA_PERL_LIB = @EXTRA_PERL_LIB@ FFMPEG_CFLAGS = @FFMPEG_CFLAGS@ FFMPEG_LIBS = @FFMPEG_LIBS@ FFMPEG_PREFIX = @FFMPEG_PREFIX@ diff --git a/web/skins/Makefile.in b/web/skins/Makefile.in index ae2e755a8..276d2930d 100644 --- a/web/skins/Makefile.in +++ b/web/skins/Makefile.in @@ -84,6 +84,7 @@ EGREP = @EGREP@ ENABLE_MMAP = @ENABLE_MMAP@ EXEEXT = @EXEEXT@ EXTRA_LIBS = @EXTRA_LIBS@ +EXTRA_PERL_LIB = @EXTRA_PERL_LIB@ FFMPEG_CFLAGS = @FFMPEG_CFLAGS@ FFMPEG_LIBS = @FFMPEG_LIBS@ FFMPEG_PREFIX = @FFMPEG_PREFIX@ diff --git a/web/skins/classic/Makefile.in b/web/skins/classic/Makefile.in index 75414e031..463aa48a7 100644 --- a/web/skins/classic/Makefile.in +++ b/web/skins/classic/Makefile.in @@ -95,6 +95,7 @@ EGREP = @EGREP@ ENABLE_MMAP = @ENABLE_MMAP@ EXEEXT = @EXEEXT@ EXTRA_LIBS = @EXTRA_LIBS@ +EXTRA_PERL_LIB = @EXTRA_PERL_LIB@ FFMPEG_CFLAGS = @FFMPEG_CFLAGS@ FFMPEG_LIBS = @FFMPEG_LIBS@ FFMPEG_PREFIX = @FFMPEG_PREFIX@ diff --git a/web/skins/classic/ajax/Makefile.in b/web/skins/classic/ajax/Makefile.in index 66e76c538..35833f7b0 100644 --- a/web/skins/classic/ajax/Makefile.in +++ b/web/skins/classic/ajax/Makefile.in @@ -86,6 +86,7 @@ EGREP = @EGREP@ ENABLE_MMAP = @ENABLE_MMAP@ EXEEXT = @EXEEXT@ EXTRA_LIBS = @EXTRA_LIBS@ +EXTRA_PERL_LIB = @EXTRA_PERL_LIB@ FFMPEG_CFLAGS = @FFMPEG_CFLAGS@ FFMPEG_LIBS = @FFMPEG_LIBS@ FFMPEG_PREFIX = @FFMPEG_PREFIX@ diff --git a/web/skins/classic/css/Makefile.in b/web/skins/classic/css/Makefile.in index b8e51d441..c8ec3fe2a 100644 --- a/web/skins/classic/css/Makefile.in +++ b/web/skins/classic/css/Makefile.in @@ -86,6 +86,7 @@ EGREP = @EGREP@ ENABLE_MMAP = @ENABLE_MMAP@ EXEEXT = @EXEEXT@ EXTRA_LIBS = @EXTRA_LIBS@ +EXTRA_PERL_LIB = @EXTRA_PERL_LIB@ FFMPEG_CFLAGS = @FFMPEG_CFLAGS@ FFMPEG_LIBS = @FFMPEG_LIBS@ FFMPEG_PREFIX = @FFMPEG_PREFIX@ diff --git a/web/skins/classic/graphics/Makefile.in b/web/skins/classic/graphics/Makefile.in index 761359a12..4e476851f 100644 --- a/web/skins/classic/graphics/Makefile.in +++ b/web/skins/classic/graphics/Makefile.in @@ -86,6 +86,7 @@ EGREP = @EGREP@ ENABLE_MMAP = @ENABLE_MMAP@ EXEEXT = @EXEEXT@ EXTRA_LIBS = @EXTRA_LIBS@ +EXTRA_PERL_LIB = @EXTRA_PERL_LIB@ FFMPEG_CFLAGS = @FFMPEG_CFLAGS@ FFMPEG_LIBS = @FFMPEG_LIBS@ FFMPEG_PREFIX = @FFMPEG_PREFIX@ diff --git a/web/skins/classic/includes/Makefile.in b/web/skins/classic/includes/Makefile.in index 89e71d85f..1c87d46df 100644 --- a/web/skins/classic/includes/Makefile.in +++ b/web/skins/classic/includes/Makefile.in @@ -86,6 +86,7 @@ EGREP = @EGREP@ ENABLE_MMAP = @ENABLE_MMAP@ EXEEXT = @EXEEXT@ EXTRA_LIBS = @EXTRA_LIBS@ +EXTRA_PERL_LIB = @EXTRA_PERL_LIB@ FFMPEG_CFLAGS = @FFMPEG_CFLAGS@ FFMPEG_LIBS = @FFMPEG_LIBS@ FFMPEG_PREFIX = @FFMPEG_PREFIX@ diff --git a/web/skins/classic/js/Makefile.in b/web/skins/classic/js/Makefile.in index 2ea2d5584..abc175dcf 100644 --- a/web/skins/classic/js/Makefile.in +++ b/web/skins/classic/js/Makefile.in @@ -86,6 +86,7 @@ EGREP = @EGREP@ ENABLE_MMAP = @ENABLE_MMAP@ EXEEXT = @EXEEXT@ EXTRA_LIBS = @EXTRA_LIBS@ +EXTRA_PERL_LIB = @EXTRA_PERL_LIB@ FFMPEG_CFLAGS = @FFMPEG_CFLAGS@ FFMPEG_LIBS = @FFMPEG_LIBS@ FFMPEG_PREFIX = @FFMPEG_PREFIX@ diff --git a/web/skins/classic/lang/Makefile.in b/web/skins/classic/lang/Makefile.in index c4f84ea6a..5c6e7b7b5 100644 --- a/web/skins/classic/lang/Makefile.in +++ b/web/skins/classic/lang/Makefile.in @@ -86,6 +86,7 @@ EGREP = @EGREP@ ENABLE_MMAP = @ENABLE_MMAP@ EXEEXT = @EXEEXT@ EXTRA_LIBS = @EXTRA_LIBS@ +EXTRA_PERL_LIB = @EXTRA_PERL_LIB@ FFMPEG_CFLAGS = @FFMPEG_CFLAGS@ FFMPEG_LIBS = @FFMPEG_LIBS@ FFMPEG_PREFIX = @FFMPEG_PREFIX@ diff --git a/web/skins/classic/views/Makefile.in b/web/skins/classic/views/Makefile.in index 647cc05e3..6832d7f64 100644 --- a/web/skins/classic/views/Makefile.in +++ b/web/skins/classic/views/Makefile.in @@ -95,6 +95,7 @@ EGREP = @EGREP@ ENABLE_MMAP = @ENABLE_MMAP@ EXEEXT = @EXEEXT@ EXTRA_LIBS = @EXTRA_LIBS@ +EXTRA_PERL_LIB = @EXTRA_PERL_LIB@ FFMPEG_CFLAGS = @FFMPEG_CFLAGS@ FFMPEG_LIBS = @FFMPEG_LIBS@ FFMPEG_PREFIX = @FFMPEG_PREFIX@ diff --git a/web/skins/classic/views/css/Makefile.in b/web/skins/classic/views/css/Makefile.in index 4eed47037..0adb86924 100644 --- a/web/skins/classic/views/css/Makefile.in +++ b/web/skins/classic/views/css/Makefile.in @@ -86,6 +86,7 @@ EGREP = @EGREP@ ENABLE_MMAP = @ENABLE_MMAP@ EXEEXT = @EXEEXT@ EXTRA_LIBS = @EXTRA_LIBS@ +EXTRA_PERL_LIB = @EXTRA_PERL_LIB@ FFMPEG_CFLAGS = @FFMPEG_CFLAGS@ FFMPEG_LIBS = @FFMPEG_LIBS@ FFMPEG_PREFIX = @FFMPEG_PREFIX@ diff --git a/web/skins/classic/views/js/Makefile.in b/web/skins/classic/views/js/Makefile.in index 468ca9e5c..79268c9c0 100644 --- a/web/skins/classic/views/js/Makefile.in +++ b/web/skins/classic/views/js/Makefile.in @@ -86,6 +86,7 @@ EGREP = @EGREP@ ENABLE_MMAP = @ENABLE_MMAP@ EXEEXT = @EXEEXT@ EXTRA_LIBS = @EXTRA_LIBS@ +EXTRA_PERL_LIB = @EXTRA_PERL_LIB@ FFMPEG_CFLAGS = @FFMPEG_CFLAGS@ FFMPEG_LIBS = @FFMPEG_LIBS@ FFMPEG_PREFIX = @FFMPEG_PREFIX@ diff --git a/web/skins/mobile/Makefile.in b/web/skins/mobile/Makefile.in index 6dfc46167..2322b6829 100644 --- a/web/skins/mobile/Makefile.in +++ b/web/skins/mobile/Makefile.in @@ -95,6 +95,7 @@ EGREP = @EGREP@ ENABLE_MMAP = @ENABLE_MMAP@ EXEEXT = @EXEEXT@ EXTRA_LIBS = @EXTRA_LIBS@ +EXTRA_PERL_LIB = @EXTRA_PERL_LIB@ FFMPEG_CFLAGS = @FFMPEG_CFLAGS@ FFMPEG_LIBS = @FFMPEG_LIBS@ FFMPEG_PREFIX = @FFMPEG_PREFIX@ diff --git a/web/skins/mobile/ajax/Makefile.in b/web/skins/mobile/ajax/Makefile.in index 106a19713..7067bc846 100644 --- a/web/skins/mobile/ajax/Makefile.in +++ b/web/skins/mobile/ajax/Makefile.in @@ -86,6 +86,7 @@ EGREP = @EGREP@ ENABLE_MMAP = @ENABLE_MMAP@ EXEEXT = @EXEEXT@ EXTRA_LIBS = @EXTRA_LIBS@ +EXTRA_PERL_LIB = @EXTRA_PERL_LIB@ FFMPEG_CFLAGS = @FFMPEG_CFLAGS@ FFMPEG_LIBS = @FFMPEG_LIBS@ FFMPEG_PREFIX = @FFMPEG_PREFIX@ diff --git a/web/skins/mobile/css/Makefile.in b/web/skins/mobile/css/Makefile.in index c83873b3f..22eaf4268 100644 --- a/web/skins/mobile/css/Makefile.in +++ b/web/skins/mobile/css/Makefile.in @@ -86,6 +86,7 @@ EGREP = @EGREP@ ENABLE_MMAP = @ENABLE_MMAP@ EXEEXT = @EXEEXT@ EXTRA_LIBS = @EXTRA_LIBS@ +EXTRA_PERL_LIB = @EXTRA_PERL_LIB@ FFMPEG_CFLAGS = @FFMPEG_CFLAGS@ FFMPEG_LIBS = @FFMPEG_LIBS@ FFMPEG_PREFIX = @FFMPEG_PREFIX@ diff --git a/web/skins/mobile/graphics/Makefile.in b/web/skins/mobile/graphics/Makefile.in index 35aa4a2a5..f23daa510 100644 --- a/web/skins/mobile/graphics/Makefile.in +++ b/web/skins/mobile/graphics/Makefile.in @@ -86,6 +86,7 @@ EGREP = @EGREP@ ENABLE_MMAP = @ENABLE_MMAP@ EXEEXT = @EXEEXT@ EXTRA_LIBS = @EXTRA_LIBS@ +EXTRA_PERL_LIB = @EXTRA_PERL_LIB@ FFMPEG_CFLAGS = @FFMPEG_CFLAGS@ FFMPEG_LIBS = @FFMPEG_LIBS@ FFMPEG_PREFIX = @FFMPEG_PREFIX@ diff --git a/web/skins/mobile/includes/Makefile.in b/web/skins/mobile/includes/Makefile.in index b2f9a8c43..b897f7825 100644 --- a/web/skins/mobile/includes/Makefile.in +++ b/web/skins/mobile/includes/Makefile.in @@ -86,6 +86,7 @@ EGREP = @EGREP@ ENABLE_MMAP = @ENABLE_MMAP@ EXEEXT = @EXEEXT@ EXTRA_LIBS = @EXTRA_LIBS@ +EXTRA_PERL_LIB = @EXTRA_PERL_LIB@ FFMPEG_CFLAGS = @FFMPEG_CFLAGS@ FFMPEG_LIBS = @FFMPEG_LIBS@ FFMPEG_PREFIX = @FFMPEG_PREFIX@ diff --git a/web/skins/mobile/lang/Makefile.in b/web/skins/mobile/lang/Makefile.in index c706ae6d5..455f869f6 100644 --- a/web/skins/mobile/lang/Makefile.in +++ b/web/skins/mobile/lang/Makefile.in @@ -86,6 +86,7 @@ EGREP = @EGREP@ ENABLE_MMAP = @ENABLE_MMAP@ EXEEXT = @EXEEXT@ EXTRA_LIBS = @EXTRA_LIBS@ +EXTRA_PERL_LIB = @EXTRA_PERL_LIB@ FFMPEG_CFLAGS = @FFMPEG_CFLAGS@ FFMPEG_LIBS = @FFMPEG_LIBS@ FFMPEG_PREFIX = @FFMPEG_PREFIX@ diff --git a/web/skins/mobile/views/Makefile.in b/web/skins/mobile/views/Makefile.in index 9aada338e..0e38324cd 100644 --- a/web/skins/mobile/views/Makefile.in +++ b/web/skins/mobile/views/Makefile.in @@ -95,6 +95,7 @@ EGREP = @EGREP@ ENABLE_MMAP = @ENABLE_MMAP@ EXEEXT = @EXEEXT@ EXTRA_LIBS = @EXTRA_LIBS@ +EXTRA_PERL_LIB = @EXTRA_PERL_LIB@ FFMPEG_CFLAGS = @FFMPEG_CFLAGS@ FFMPEG_LIBS = @FFMPEG_LIBS@ FFMPEG_PREFIX = @FFMPEG_PREFIX@ diff --git a/web/skins/mobile/views/css/Makefile.in b/web/skins/mobile/views/css/Makefile.in index a33571ed1..ae5fa0396 100644 --- a/web/skins/mobile/views/css/Makefile.in +++ b/web/skins/mobile/views/css/Makefile.in @@ -86,6 +86,7 @@ EGREP = @EGREP@ ENABLE_MMAP = @ENABLE_MMAP@ EXEEXT = @EXEEXT@ EXTRA_LIBS = @EXTRA_LIBS@ +EXTRA_PERL_LIB = @EXTRA_PERL_LIB@ FFMPEG_CFLAGS = @FFMPEG_CFLAGS@ FFMPEG_LIBS = @FFMPEG_LIBS@ FFMPEG_PREFIX = @FFMPEG_PREFIX@ diff --git a/web/tools/Makefile.in b/web/tools/Makefile.in index 5730f79aa..bc197a5fe 100644 --- a/web/tools/Makefile.in +++ b/web/tools/Makefile.in @@ -84,6 +84,7 @@ EGREP = @EGREP@ ENABLE_MMAP = @ENABLE_MMAP@ EXEEXT = @EXEEXT@ EXTRA_LIBS = @EXTRA_LIBS@ +EXTRA_PERL_LIB = @EXTRA_PERL_LIB@ FFMPEG_CFLAGS = @FFMPEG_CFLAGS@ FFMPEG_LIBS = @FFMPEG_LIBS@ FFMPEG_PREFIX = @FFMPEG_PREFIX@ diff --git a/web/tools/mootools/Makefile.in b/web/tools/mootools/Makefile.in index 3916ffac3..1619dffac 100644 --- a/web/tools/mootools/Makefile.in +++ b/web/tools/mootools/Makefile.in @@ -86,6 +86,7 @@ EGREP = @EGREP@ ENABLE_MMAP = @ENABLE_MMAP@ EXEEXT = @EXEEXT@ EXTRA_LIBS = @EXTRA_LIBS@ +EXTRA_PERL_LIB = @EXTRA_PERL_LIB@ FFMPEG_CFLAGS = @FFMPEG_CFLAGS@ FFMPEG_LIBS = @FFMPEG_LIBS@ FFMPEG_PREFIX = @FFMPEG_PREFIX@ diff --git a/web/views/Makefile.in b/web/views/Makefile.in index 40ba96782..a97797264 100644 --- a/web/views/Makefile.in +++ b/web/views/Makefile.in @@ -86,6 +86,7 @@ EGREP = @EGREP@ ENABLE_MMAP = @ENABLE_MMAP@ EXEEXT = @EXEEXT@ EXTRA_LIBS = @EXTRA_LIBS@ +EXTRA_PERL_LIB = @EXTRA_PERL_LIB@ FFMPEG_CFLAGS = @FFMPEG_CFLAGS@ FFMPEG_LIBS = @FFMPEG_LIBS@ FFMPEG_PREFIX = @FFMPEG_PREFIX@