Merge pull request #16528 from mattwire/removeoldflexmailer

[civicrm-core.git] / xml / GenCode.php

diff --git a/xml/GenCode.php b/xml/GenCode.php
index 01b541c9bdda5857b18d8cebf0f85ac564d52fda..78661a911143166a24450c47dfcc68b41dc18c05 100644 (file)
--- a/xml/GenCode.php
+++ b/xml/GenCode.php
@@ -4,7 +4,8 @@ if (PHP_SAPI !== 'cli') {
   die("GenCode can only be run from command line.");
 }
 
-ini_set('include_path', '.' . PATH_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'packages' . PATH_SEPARATOR . '..');
+$includes = ['.', '../packages', '../../civicrm-packages', '..'];
+ini_set('include_path', implode(PATH_SEPARATOR, $includes));
 // make sure the memory_limit is at least 512 MB
 $memLimitString = trim(ini_get('memory_limit'));
 $memLimitUnit = strtolower(substr($memLimitString, -1));