Merge pull request #210 from stroobandt/patch-1

Makefile and installation instructions for Ubuntu.

2 files changed, 20 insertions, 0 deletions

diff --git a/Readme.md b/Readme.md
index c944f0a..c28cb31 100644
--- a/Readme.md
+++ b/Readme.md
@@ -61,6 +61,22 @@ brew tap nickolasburr/pfa
 brew install sc-im
 ```
 
+### Ubuntu with XLSX import & export
+
+See [this wiki page](https://github.com/andmarti1424/sc-im/wiki/Ubuntu-with-XLSX-import-&-export).
+
+### Configuration
+
+The file `~/.scimrc` contains configuration data. Here is an example.
+
+    set autocalc
+    set numeric
+    set numeric_decimal=0
+    set overlap
+    set xlsx_readformulas
+    
+Other configuration variables are listed in the [help file](https://raw.githubusercontent.com/andmarti1424/sc-im/freeze/src/doc).
+
 ### Helping us
 
 Want to help?  You can help us with one or more of the following:
diff --git a/src/Makefile b/src/Makefile
index e3770c7..dd49467 100755
--- a/src/Makefile
+++ b/src/Makefile
@@ -77,6 +77,10 @@ ifneq (,$(wildcard /usr/include/xlsxwriter.h))
   CFLAGS += -DXLSX_EXPORT
   LDLIBS += -lxlsxwriter
 endif
+ifneq (,$(wildcard /usr/local/include/xlsxwriter.h))
+  CFLAGS += -DXLSX_EXPORT
+  LDLIBS += -lxlsxwriter
+endif
 
 # Check for gnuplot existance
 ifneq (, $(shell which gnuplot))