Permalink
Browse files

Updates for gnuplot 4.4 on windows.

  • Loading branch information...
1 parent bc0561e commit 771d0c2d8a13bb3e22010dda86ac02a1137340a1 andrejv committed Jan 7, 2011
Showing with 8 additions and 11 deletions.
  1. +2 −5 interfaces/xmaxima/win32/Makefile.in
  2. +4 −4 maxima.iss.in
  3. +1 −1 src/maxima.bat.in
  4. +1 −1 src/plot.lisp
@@ -76,11 +76,8 @@ gcccopy:
# Install the gnuplot binary files in bin
gnuplot:
- mkdir -p $(prefix)/bin/share/PostScript
- cp $(GNUPLOTDIR)/bin/wgnuplot.exe $(prefix)/bin
- cp $(GNUPLOTDIR)/bin/wgnuplot.hlp $(prefix)/bin
- cp $(GNUPLOTDIR)/bin/wgnuplot.mnu $(prefix)/bin
- cp $(GNUPLOTDIR)/bin/share/PostScript/prologue.ps $(prefix)/bin/share/PostScript
+ mkdir -p $(prefix)/gnuplot
+ cp -rf $(GNUPLOTDIR)/binary/* $(prefix)/gnuplot
# Install wxMaxima
wxmaxima:
View
@@ -79,7 +79,7 @@ Source: "@prefix@\readme_*.txt"; DestDir: "{app}"; Components: "core"
Source: "@prefix@\*.*"; Excludes: "\bin\xmaxima.*,\bin\xmaxima,\wxMaxima,\info,\share\maxima\@VERSION@\doc\html,\share\maxima\@VERSION@\doc\chm"; DestDir: "{app}\"; Flags: recursesubdirs; Components: "core"
Source: "@prefix@\share\maxima\@VERSION@\doc\html\intromax.html"; DestDir: "{app}\share\maxima\@VERSION@\doc\html\"; Flags: ignoreversion; Components: "core"
Source: "@prefix@\share\maxima\@VERSION@\doc\chm\maxima.chm"; DestDir: "{app}\share\maxima\@VERSION@\doc\chm\"; Flags: ignoreversion; Components: "core"
-Source: "@prefix@\info\*.*"; DestDir: "{app}\info\"; Flags: ignoreversion; Components: "core"
+Source: "@prefix@\share\info\*.*"; DestDir: "{app}\info\"; Flags: ignoreversion; Components: "core"
; wmaxima
Source: "@prefix@\wxMaxima\*.*"; DestDir: "{app}\wxMaxima\"; Flags: ignoreversion recursesubdirs; Components: "wxmaxima"
@@ -89,13 +89,13 @@ Source: "@prefix@\bin\xmaxima.*"; DestDir: "{app}\bin\"; Flags: ignoreversion; C
Source: "@prefix@\bin\xmaxima"; DestDir: "{app}\bin\"; Flags: ignoreversion; Components: "xmaxima"
; lang\spanish
-Source: "@prefix@\info\es\*.*"; DestDir: "{app}\info\es\"; Flags: recursesubdirs; Components: "lang\spanish"
+Source: "@prefix@\share\info\es\*.*"; DestDir: "{app}\info\es\"; Flags: recursesubdirs; Components: "lang\spanish"
Source: "@prefix@\share\maxima\@VERSION@\doc\chm\es\maxima.chm"; DestDir: "{app}\share\maxima\@VERSION@\doc\chm\es\"; Components: "lang\spanish"
; lang\portuguese
-Source: "@prefix@\info\pt\*.*"; DestDir: "{app}\info\pt\"; Flags: recursesubdirs; Components: "lang\portuguese"
+Source: "@prefix@\share\info\pt\*.*"; DestDir: "{app}\info\pt\"; Flags: recursesubdirs; Components: "lang\portuguese"
Source: "@prefix@\share\maxima\@VERSION@\doc\chm\pt\maxima.chm"; DestDir: "{app}\share\maxima\@VERSION@\doc\chm\pt\"; Components: "lang\portuguese"
; lang\brazilian
-Source: "@prefix@\info\pt_BR\*.*"; DestDir: "{app}\info\pt_BR\"; Flags: recursesubdirs; Components: "lang\brazilian"
+Source: "@prefix@\share\info\pt_BR\*.*"; DestDir: "{app}\info\pt_BR\"; Flags: recursesubdirs; Components: "lang\brazilian"
Source: "@prefix@\share\maxima\@VERSION@\doc\chm\pt_BR\maxima.chm"; DestDir: "{app}\share\maxima\@VERSION@\doc\chm\pt_BR\"; Components: "lang\brazilian"
View
@@ -22,7 +22,7 @@ set maxima_prefix=@prefix@
set package=@PACKAGE@
set verbose=false
set mingw_gccver=GCCVER
-set path=%maxima_prefix%\bin;%maxima_prefix%\lib\gcc-lib\mingw32\GCCVER;%path%
+set path=%maxima_prefix%\gnuplot;%maxima_prefix%\bin;%maxima_prefix%\lib\gcc-lib\mingw32\GCCVER;%path%
if "%USERPROFILE%" == "" goto win9x
if "%MAXIMA_USERDIR%" == "" set MAXIMA_USERDIR=%USERPROFILE%\maxima
View
@@ -78,7 +78,7 @@ sin(y)*(10.0+6*cos(x)),
;; adaptive-plotting will do.
((mlist) $adapt_depth 5)
((mlist) $gnuplot_preamble "")
- ((mlist) $gnuplot_default_term_command "set term pop")
+ ((mlist) $gnuplot_default_term_command ,(if (string= *autoconf-win32* "true") "set term windows" "set term pop"))
((mlist) $gnuplot_dumb_term_command
"set term dumb 79 22")
((mlist) $gnuplot_ps_term_command

0 comments on commit 771d0c2

Please sign in to comment.