[giac] 01/03: Minor tweaks: clean more stuff and suppress a non-fatal warning

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository giac.

commit 1dd135c98c8ae15f96303c683b1520890211108a
Author: Ximin Luo <infinity0 at debian.org>
Date:   Tue Jun 20 16:18:03 2017 +0200

    Minor tweaks: clean more stuff and suppress a non-fatal warning
---
 debian/clean                                     |  5 ++++
 debian/patches/find-doc-files-at-buildtime.patch | 32 ++++++++++++++++++++++++
 debian/patches/series                            |  1 +
 debian/upstream-doc-fr/Makefile.am.Debian        |  2 +-
 4 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/debian/clean b/debian/clean
index bda9b87..66312e3 100644
--- a/debian/clean
+++ b/debian/clean
@@ -2,3 +2,8 @@ doc/giac.js
 doc/fr/
 doc/*/texinfo.tex
 doc/texinfo.tex
+src/input_lexer.cc
+src/lexer.h
+src/input_parser.cc
+src/input_parser.h
+src/input_parser.hh
diff --git a/debian/patches/find-doc-files-at-buildtime.patch b/debian/patches/find-doc-files-at-buildtime.patch
new file mode 100644
index 0000000..c10593a
--- /dev/null
+++ b/debian/patches/find-doc-files-at-buildtime.patch
@@ -0,0 +1,32 @@
+Description: Allow XCAS_ROOT override, so doc files can be found during the build
+ By default the documentation build looks in /usr/share, leading to non-fatal
+ errors like "// Unable to find keyword file doc/en/keywords".
+Author: Ximin Luo <infinity0 at debian.org>
+Forwarded: not-needed
+
+diff --git a/src/global.cc b/src/global.cc
+index 49bff8b..00e1d6f 100755
+--- a/src/global.cc
++++ b/src/global.cc
+@@ -2551,6 +2551,10 @@ extern "C" void Sleep(unsigned int miliSecond);
+     if (!access((xcasroot()+"aide_cas").c_str(),R_OK)){
+       return xcasroot();
+     }
++    if (getenv("XCAS_ROOT")){
++      string s=getenv("XCAS_ROOT");
++      return s;
++    }
+     if (xcasroot().size()>4 && xcasroot().substr(xcasroot().size()-4,4)=="bin/"){
+       string s(xcasroot().substr(0,xcasroot().size()-4));
+       s+="share/giac/";
+@@ -2561,10 +2565,6 @@ extern "C" void Sleep(unsigned int miliSecond);
+ #ifdef __APPLE__
+     if (!access("/Applications/usr/share/giac/",R_OK))
+       return "/Applications/usr/share/giac/";
+-    if (getenv("XCAS_ROOT")){
+-      string s=getenv("XCAS_ROOT");
+-      return s;
+-    }
+     return "/Applications/usr/share/giac/";
+ #endif
+ #ifdef WIN32
diff --git a/debian/patches/series b/debian/patches/series
index 2569290..ac405ee 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@ dont-bg-hevea.patch
 test-fixes.patch
 dont-build-files-excluded.patch
 dont-include-remote-scripts.patch
+find-doc-files-at-buildtime.patch
diff --git a/debian/upstream-doc-fr/Makefile.am.Debian b/debian/upstream-doc-fr/Makefile.am.Debian
index 485df7c..04d0594 100644
--- a/debian/upstream-doc-fr/Makefile.am.Debian
+++ b/debian/upstream-doc-fr/Makefile.am.Debian
@@ -32,4 +32,4 @@ giacfr.tex: ../giacfr.tex
 	cp "$<" "$@"
 
 algo.pdf algo.html: algo.tex giacfr.tex
-	xvfb-run -a ../../src/icas "$<"
+	xvfb-run -a env XCAS_ROOT=../../ ../../src/icas "$<"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/giac.git