From f3f10d128acbc9dbfc7c6ce0d181ef4a9cf39313 Mon Sep 17 00:00:00 2001
From: Friedrich Beckmann <friedrich.beckmann@gmx.de>
Date: Fri, 29 May 2015 14:32:59 +0200
Subject: [PATCH] Smake: build from git on Mac OSX

---
 README.Git | 35 +++++++++++++++++++++++++++++++++++
 Smake      |  3 ++-
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/README.Git b/README.Git
index 4a7f7496f0..c314e73f42 100644
--- a/README.Git
+++ b/README.Git
@@ -99,3 +99,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...)
diff --git a/Smake b/Smake
index 227affa36b..a989f2d078 100644
--- a/Smake
+++ b/Smake
@@ -320,7 +320,8 @@ src/ui/gui/icons/manifest: $(MAKEFILE_LIST)
 	echo >> $@
 	printf 'icon_srcs = ' >> $@
 	for i in  $(ICONS); do \
-	  printf ' \\\n\t '$$i | sed -e 's/\.png$$/.svg/' -e 's%/icons/%/artwork/%' >> $@ ; \
+	  printf ' \\\n\t ' >> $@ ;\
+	  printf $$i | awk '{ gsub(".png",".svg")gsub("icons","artwork");printf $$0}' >> $@ ; \
 	done
 	echo ' ' >> $@
 	echo >> $@
-- 
2.30.2