Author: schristley-guest
Date: 2011-02-17 00:47:51 +0000 (Thu, 17 Feb 2011)
New Revision: 6007
Modified:
trunk/packages/maude/trunk/debian/patches/search-datadir.patch
Log:
fix maude patch
Modified: trunk/packages/maude/trunk/debian/patches/search-datadir.patch
===================================================================
--- trunk/packages/maude/trunk/debian/patches/search-datadir.patch
2011-02-17 00:36:22 UTC (rev 6006)
+++ trunk/packages/maude/trunk/debian/patches/search-datadir.patch
2011-02-17 00:47:51 UTC (rev 6007)
@@ -1,22 +1,26 @@
Have maude search in datadir for its files.
--- a/src/Main/main.cc
+++ b/src/Main/main.cc
-@@ -263,6 +263,8 @@
+@@ -263,6 +263,11 @@
{
if (directoryManager.searchPath(MAUDE_LIB, directory, fileName, R_OK))
return true;
-+ if (directoryManager.searchPath(DATADIR, directory, fileName, R_OK))
-+ return true;
++ if (directoryManager.checkAccess(DATADIR, fileName, R_OK))
++ {
++ directory = DATADIR;
++ return true;
++ }
if (!(executableDirectory.empty()) &&
directoryManager.checkAccess(executableDirectory, fileName, R_OK))
{
--- a/src/Mixfix/global.cc
+++ b/src/Mixfix/global.cc
-@@ -83,6 +83,8 @@
+@@ -83,6 +83,9 @@
return true;
if (directoryManager.searchPath(MAUDE_LIB, directory, fileName, R_OK,
ext))
return true;
-+ if (directoryManager.searchPath(DATADIR, directory, fileName, R_OK,
ext))
++ directory = DATADIR;
++ if (directoryManager.checkAccess(directory, fileName, R_OK, ext))
+ return true;
if (!(executableDirectory.empty()) &&
directoryManager.checkAccess(executableDirectory, fileName, R_OK,
ext))
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/debian-med-commit
