desktop: changed translations to msgfmt and xgettext

[pspp] / README.Git

diff --git a/README.Git b/README.Git
index 4a7f7496f05b025fd6b82d39e48f75f1eac6ebb7..f101c058a8f60d252c25b73c86732a5f4c65a17d 100644 (file)
--- 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,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,16 @@ 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
 
-           vasnprintf: fix potential use after free
+  commit 1e972a8a37c153ddc15e604592f84f939eb3c2ad
+  Author: Bruno Haible <bruno@clisp.org>
+  Date:   Sat Jun 6 10:14:24 2020 +0200
+
+    calloc-gnu tests: Avoid a test failure with clang.
+
+    * tests/test-calloc-gnu.c (main): Mark the pointer variable as
+    'volatile', to defeat compiler optimizations.
 
-           * lib/vasnprintf.c (VASNPRINTF): Fix free-memory read,
-           flagged by clang-analyzer 3.4.2.
 
 To clone Gnulib into a directory named "gnulib" using Git, and then
 check out this particular commit, run these commands:
@@ -97,5 +99,40 @@ Then you need to run
 psppire uses some self defined widgets. To use glade these widgets have
 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
+psppire.xml files in the appropriate 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...)