void-packages/srcpkgs/gfan/patches/new-cddlib-header-location....

72 lines
3.0 KiB
Diff

diff --git a/doc/installation.tex b/doc/installation.tex
index 763f147..61c87be 100644
--- a/doc/installation.tex
+++ b/doc/installation.tex
@@ -20,7 +20,7 @@ Should this command fail, then you are using an old version of gfan.
As an alternative to using package managers as above you can try to locate an executable file named ``gfan'' in the installation of other math software. SageMath, for example, contains a gfan executable. You also have the possibility of installing a precompiled executables: go to the Gfan webpage, go to the binaries.html subpage, and follow the instructions there. There is however only very few executables available.
%% Rewrite this section.
-%% The apt-get linux trouble disappears if all includes of cdd files are of form ``cdd/set\_oper.h''. Now of course if we cannot run apt-get because we are not root we need to install cddlib manually. Here we should use configure to specify how that is done correctly. We should use --prefix=, --includedir=, and possibly --libdir=.
+%% The apt-get linux trouble disappears if all includes of cdd files are of form ``cddlib/set\_oper.h''. Now of course if we cannot run apt-get because we are not root we need to install cddlib manually. Here we should use configure to specify how that is done correctly. We should use --prefix=, --includedir=, and possibly --libdir=.
%% The same thing goes for gmp???? EXCEPT THAT FOR SOME REASON gmp is allowed to be in /usr/include .
diff --git a/src/app_librarytest.cpp b/src/app_librarytest.cpp
index 3b1395b..d91a264 100644
--- a/src/app_librarytest.cpp
+++ b/src/app_librarytest.cpp
@@ -12,8 +12,8 @@
#include "setoper.h"
#include "cdd.h"
#else
-#include "cdd/setoper.h"
-#include "cdd/cdd.h"
+#include "cddlib/setoper.h"
+#include "cddlib/cdd.h"
#endif
#include <iostream>
#include <fstream>
diff --git a/src/gfanlib_zcone.cpp b/src/gfanlib_zcone.cpp
index f24f09c..481f116 100644
--- a/src/gfanlib_zcone.cpp
+++ b/src/gfanlib_zcone.cpp
@@ -16,8 +16,8 @@
#include "setoper.h"
#include "cdd.h"
#else
-#include "cdd/setoper.h"
-#include "cdd/cdd.h"
+#include "cddlib/setoper.h"
+#include "cddlib/cdd.h"
#endif
//}
@@ -52,8 +52,8 @@ namespace gfan{
"dd_free_global_constants()\n"
"in your deinitialisation code (only available for cddlib version>=094d).\n"
"This requires the header includes:\n"
- "#include \"cdd/setoper.h\"\n"
- "#include \"cdd/cdd.h\"\n"
+ "#include \"cddlib/setoper.h\"\n"
+ "#include \"cddlib/cdd.h\"\n"
"\n"
"Alternatively, you may call gfan:initializeCddlibIfRequired() and deinitializeCddlibIfRequired()\n"
"if gfanlib is the only code using cddlib. If at some point cddlib is no longer required by gfanlib\n"
diff --git a/src/lp_cdd.cpp b/src/lp_cdd.cpp
index ec36517..5232d50 100644
--- a/src/lp_cdd.cpp
+++ b/src/lp_cdd.cpp
@@ -5,9 +5,9 @@
#include "cdd.h"
#include "cdd_f.h"
#else
-#include "cdd/setoper.h"
-#include "cdd/cdd.h"
-#include "cdd/cdd_f.h"
+#include "cddlib/setoper.h"
+#include "cddlib/cdd.h"
+#include "cddlib/cdd_f.h"
#endif
//}
#include "termorder.h"