|
@@ -402,13 +402,12 @@ class PackageClass
|
|
|
$macroFiles = $app["distribute-root"]["macro-files"] ? : array();
|
|
|
|
|
|
$rootDirUp2 = dirname(dirname($rootDir));
|
|
|
- $rootDirUp2 = str_replace('\\','/',$rootDirUp2);
|
|
|
$appdataDir = pathJoin($rootDirUp2,'appdata');
|
|
|
$tmpdataDir = pathJoin($rootDirUp2,'tmpdata');
|
|
|
$macros = array(
|
|
|
- '{sis31.appdir}' => $rootDir,
|
|
|
- '{sis31.appdata}' => $appdataDir,
|
|
|
- '{sis31.tmpdata}' => $tmpdataDir,
|
|
|
+ '{sis31.appdir}' => str_replace('\\','/',$rootDir),
|
|
|
+ '{sis31.appdata}' => str_replace('\\','/',$appdataDir),
|
|
|
+ '{sis31.tmpdata}' => str_replace('\\','/',$tmpdataDir),
|
|
|
);
|
|
|
foreach($macroFiles as $fileInfo){
|
|
|
$fileName = $fileInfo['path'];
|