flixengine-phploader.patch

   1 --- flix-engine-installer-linux-8.0.10.1_DEMO/.flix-engine-installation-files/flixsamples/php/process_sample.php~       2008-01-24 16:48:07.787475442 +0200
   2 +++ flix-engine-installer-linux-8.0.10.1_DEMO/.flix-engine-installation-files/flixsamples/php/process_sample.php        2008-01-24 16:50:09.364770427 +0200
   3 @@ -152,7 +152,7 @@
   4  # Load the FlixEngine module
   5  # add extension_dir/.. to 'include_path' as this is often missing from php.ini
   6  set_include_path(get_include_path().PATH_SEPARATOR.ini_get("extension_dir")."/..");
   7 -$flixphp = 'flixengine2.php';
   8 +$flixphp = '/usr/share/php/flixengine2.php';
   9  echo 'Loading flix: ' . $flixphp . "\n<br>";
  10  include ($flixphp);
  11
  12 --- flix-engine-installer-linux-8.0.7.1_DEMO/.flix-engine-installation-files/flixsamples/php/cli_encode.php~    2006-11-07 19:09:40.000000000 +0200
  13 +++ flix-engine-installer-linux-8.0.7.1_DEMO/.flix-engine-installation-files/flixsamples/php/cli_encode.php     2006-12-28 20:47:17.341495917 +0200
  14 @@ -61,7 +61,7 @@
  15  }
  16
  17  # Load the FlixEngine module
  18 -$flixphp = 'flixengine2.php';
  19 +$flixphp = '/usr/share/php/flixengine2.php';
  20  echo 'Loading flix: ' . $flixphp . "\n";
  21  # If this include fails you may need to edit you include_path variable in
  22  # your php.ini file.
  23 --- flix-engine-installer-linux-8.0.10.1_DEMO/.flix-engine-installation-files/flixsamples/php/flix2_sample.php~ 2008-01-24 16:48:07.791475616 +0200
  24 +++ flix-engine-installer-linux-8.0.10.1_DEMO/.flix-engine-installation-files/flixsamples/php/flix2_sample.php  2008-01-24 16:51:20.067848669 +0200
  25 @@ -17,7 +17,7 @@
  26  ## add extension_dir/.. to 'include_path' as this is often missing from php.ini
  27  set_include_path(get_include_path().PATH_SEPARATOR.ini_get("extension_dir")."/..");
  28
  29 -$incret     = include ('flixengine2.php');
  30 +$incret     = require_once '/usr/share/php/flixengine2.php';
  31  $prefix     = "/var/www/cgi-bin/";
  32  $indir      = $prefix."flixmedia/in/";
  33  $overlaydir = $prefix."flixmedia/overlay/";
  34 --- flix-engine-installer-linux-8.0.13.0/.flix-engine-installation-files/flixphp/target.mk~     2008-10-25 18:44:21.000000000 +0300
  35 +++ flix-engine-installer-linux-8.0.13.0/.flix-engine-installation-files/flixphp/target.mk      2008-10-28 23:52:01.124921220 +0200
  36 @@ -23,14 +23,15 @@
  37
  38  PHPINCS := $(shell php-config --includes)
  39  PHPINST := $(shell php-config --extension-dir)
  40 +PHPLIB  := /usr/share/php
  41  $(PHPWRAP_SO): $(PHPWRAP_C)
  42         $(CC) $(CFLAGS) $(PHPINCS) -shared $(PHPWRAP_C) \
  43                -lflixengine2 -o $(PHPWRAP_SO)
  44
  45  install:
  46 -       mkdir -p $(DESTDIR)$(PHPINST)
  47 +       mkdir -p $(DESTDIR)$(PHPINST) $(DESTDIR)$(PHPLIB)
  48         install -p $(PHPWRAP_SO) $(DESTDIR)$(PHPINST)
  49 -       install -p $(PHPWRAP_PHP) $(DESTDIR)/usr/lib
  50 +       install -p $(PHPWRAP_PHP) $(DESTDIR)$(PHPLIB)
  51
  52  clean:
  53         $(RM) -f $(PHPWRAP_SO)