Add copyright and licence notices to files which lack them.

[pspp] / README.Git

diff --git a/README.Git b/README.Git
index 4a7f7496f05b025fd6b82d39e48f75f1eac6ebb7..98ac1a020dab09c0e9cca85e2f4e832cfa6ffc8e 100644 (file)
--- a/README.Git
+++ b/README.Git
@@ -21,7 +21,7 @@ following:
 
        * libtool 1.5.22 (or later).
 
-       * Texinfo 4.7 or later, to build the documentation.
+       * Texinfo 5.2 or later, to build the documentation.
 
        * Gimp --  2.8.2 is known to work
 
@@ -36,14 +36,13 @@ This version of PSPP should work with the Gnulib commit shown below.
 Gnulib does not maintain a stable API or ABI, so it is possible that
 PSPP will not work with older or newer versions of Gnulib.
 
-       commit c5c4f53b31f1ad04f4033a6124120ffec9257847
-       Author: Pádraig Brady <P@draigBrady.com>
-       Date:   Sat Dec 6 01:14:02 2014 +0000
+       commit 9ae75d1450362acb61bfa1f0f77905b76f894838 
+       Author: Bruno Haible <bruno@clisp.org>
+       Date:   Sun Jun 25 11:09:42 2017 +0200
 
-           vasnprintf: fix potential use after free
+           stat: Improve last change.
 
-           * lib/vasnprintf.c (VASNPRINTF): Fix free-memory read,
-           flagged by clang-analyzer 3.4.2.
+           * lib/stat-w32.c: Revert last change. Use generic idiom instead.
 
 To clone Gnulib into a directory named "gnulib" using Git, and then
 check out this particular commit, run these commands:
@@ -99,3 +98,38 @@ to be announced to glade such that you can view the interface.
 The install process will install the psppire glade library, icons and
 psppire.xml files in the appropiate system locations. You cannot override
 this with --prefix. After that you can run "glade" and open the ui files.
+
+Building from git on Mac OS
+---------------------------
+
+You can build on MacOS in the macports environment. After installing all
+required packages to resolve library dependencies and autotools e.t.c, you
+run make -f Smake as described above.
+
+The macports system provides the libraries and header files in a separate
+location from the MacOS system libraries. The typical locations are
+
+Libraries: /opt/local/lib
+Headers:   /opt/local/include
+
+pspp under macports will be linked against the macports libraries. The configure
+script has to be informed about the library and header locations. Assume the following
+directory structure for an out of tree build:
+
+~/mypspp
+  |----pspp    (This is the pspp git directory)
+  |----install (The install location containing also ui files for psppire)
+  |----build   (The build directory)
+  |----gnulib  (The gnulib directory as described above)
+
+Then you can build with the following commands:
+
+    cd ~/mypspp/pspp
+    make -f Smake
+    cd ../build
+    ../pspp/configure --prefix=/Users/USER/mypspp/install \
+                  LDFLAGS=-L/opt/local/lib \
+                 CPPFLAGS=-I/opt/local/include
+    make
+    make install
+    ../install/bin/psppire (If everything worked, you should see psppire...)