X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=README.Git;h=8202f03b591c4b34ce89f5b62d47e8b4d6a7df5b;hb=refs%2Fheads%2Fctables7;hp=98ea98242798cf946449e0b7d4a511b828d26770;hpb=66e2e5b63f1ed3a343bb9b6e92f955b172a6ed54;p=pspp

diff --git a/README.Git b/README.Git
index 98ea982427..8202f03b59 100644
--- a/README.Git
+++ b/README.Git
@@ -9,7 +9,7 @@ following:
 
 	* Automake 1.10 (or later).
 
-	* Gettext 0.17 (or later).
+	* Gettext 0.19 (or later).
 
 	* GNU M4 1.4.9 (or later).
 
@@ -21,7 +21,9 @@ 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
 
 After you install PSPP's prerequisites, you must obtain a copy of
 Gnulib, then bootstrap the tree, as described in the sections below.
@@ -34,12 +36,14 @@ 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 392f10a02b1effd254f3a751e42daccf929c3efa
-	Author: John Darrington <john@darrington.wattle.id.au>
-	Date:   Sun Jul 29 00:30:48 2012 +0200
+ commit 0edaafc813caff4101c58405c6ab279597afc0b9
+ Author: Bruno Haible <bruno@clisp.org>
+ Date:   Sat Oct 10 22:52:22 2020 +0200
+
+     *-list, *-oset, *-omap: Avoid possible compiler warnings.
 
-	    clean-temp: Fix memory leak.
-	    
+     Reported by Marc Nieper-Wißkirchen in
+     <https://lists.gnu.org/r/bug-gnulib/2020-10/msg00025.html>.
 
 To clone Gnulib into a directory named "gnulib" using Git, and then
 check out this particular commit, run these commands:
@@ -75,3 +79,38 @@ Once PSPP is built, you may run its self-tests with:
 	make check
 or for a more thorough test:
 	make distcheck
+
+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...)