Applied patch [ 571965 ] update stc contrib stuff

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15928 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/samples/stc/Makefile.in b/contrib/samples/stc/Makefile.in
index cffdcc78d7202a8764000ffff68ee2bc48991cb5..c9ab5b02612842f89e8ce825878ecca304b4e155 100644 (file)
--- a/contrib/samples/stc/Makefile.in
+++ b/contrib/samples/stc/Makefile.in
@@ -19,3 +19,6 @@ APPEXTRADEFS=-I$(top_srcdir)/contrib/include
 DATAFILES=stctest.cpp
 
 include $(top_builddir)/src/makeprog.env
+
+INSTALL:=../../$(INSTALL)
+

diff --git a/contrib/src/stc/Makefile.in b/contrib/src/stc/Makefile.in
index 01b2877cb8b8043c2aac5a539cbd998fe73f49b9..8c64fb6ee93ddbfad4ad403186f68895c75cde98 100644 (file)
--- a/contrib/src/stc/Makefile.in
+++ b/contrib/src/stc/Makefile.in
@@ -68,4 +68,6 @@ APPEXTRADEFS=-D__WX__ -DSCI_LEXER -DLINK_LEXERS -I$(scintilla_dir)/src -I$(scint
 
 include $(top_builddir)/src/makelib.env
 
+INSTALL:=../../$(INSTALL)
+
 -include $(DEPFILES)

diff --git a/contrib/src/stc/README.txt b/contrib/src/stc/README.txt
index 46bc58fb014afb48694999a920cac54485531c37..4b66121e643718f9b92b64ccb91eac60d6c4a6d4 100644 (file)
--- a/contrib/src/stc/README.txt
+++ b/contrib/src/stc/README.txt
@@ -44,4 +44,12 @@ wxEvents.
 
 Robin
 
+[SOLARIS NOTE - ellers@iinet.net.au - June 2002]
+
+On sunos5 (sparc) the stc code breaks if optimisation is turned on (the
+default). If your release build breaks but the debug build is fine, 
+try reconfiguring with --disable-optimise and rebuilding. If you are using
+wxPython you will also need to disable optimised compiling. To do this I
+had to hand modify the python makefile in (prefix)/lib/python2.2/config/Makefile
+to remove optimisation flags.
 

diff --git a/samples/stc/Makefile.in b/samples/stc/Makefile.in
index cffdcc78d7202a8764000ffff68ee2bc48991cb5..c9ab5b02612842f89e8ce825878ecca304b4e155 100644 (file)
--- a/samples/stc/Makefile.in
+++ b/samples/stc/Makefile.in
@@ -19,3 +19,6 @@ APPEXTRADEFS=-I$(top_srcdir)/contrib/include
 DATAFILES=stctest.cpp
 
 include $(top_builddir)/src/makeprog.env
+
+INSTALL:=../../$(INSTALL)
+

diff --git a/src/stc/Makefile.in b/src/stc/Makefile.in
index 01b2877cb8b8043c2aac5a539cbd998fe73f49b9..8c64fb6ee93ddbfad4ad403186f68895c75cde98 100644 (file)
--- a/src/stc/Makefile.in
+++ b/src/stc/Makefile.in
@@ -68,4 +68,6 @@ APPEXTRADEFS=-D__WX__ -DSCI_LEXER -DLINK_LEXERS -I$(scintilla_dir)/src -I$(scint
 
 include $(top_builddir)/src/makelib.env
 
+INSTALL:=../../$(INSTALL)
+
 -include $(DEPFILES)

diff --git a/src/stc/README.txt b/src/stc/README.txt
index 46bc58fb014afb48694999a920cac54485531c37..4b66121e643718f9b92b64ccb91eac60d6c4a6d4 100644 (file)
--- a/src/stc/README.txt
+++ b/src/stc/README.txt
@@ -44,4 +44,12 @@ wxEvents.
 
 Robin
 
+[SOLARIS NOTE - ellers@iinet.net.au - June 2002]
+
+On sunos5 (sparc) the stc code breaks if optimisation is turned on (the
+default). If your release build breaks but the debug build is fine, 
+try reconfiguring with --disable-optimise and rebuilding. If you are using
+wxPython you will also need to disable optimised compiling. To do this I
+had to hand modify the python makefile in (prefix)/lib/python2.2/config/Makefile
+to remove optimisation flags.