From ff497ae4fa2e96f3b0970647029082764b890acd Mon Sep 17 00:00:00 2001
From: Kenneth Heafield <kheafiel@cluster01.lti.ece.cmu.local>
Date: Sun, 27 May 2012 15:00:41 -0400
Subject: Guard unistd.h for windows :-(

---
 klm/util/file.cc | 3 ++-
 klm/util/mmap.cc | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/klm/util/file.cc b/klm/util/file.cc
index 1bd056fc..6a3885a7 100644
--- a/klm/util/file.cc
+++ b/klm/util/file.cc
@@ -10,11 +10,12 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <stdint.h>
-#include <unistd.h>
 
 #if defined(_WIN32) || defined(_WIN64)
 #include <windows.h>
 #include <io.h>
+#else
+#include <unistd.h>
 #endif
 
 namespace util {
diff --git a/klm/util/mmap.cc b/klm/util/mmap.cc
index e0d2570b..576fd4cc 100644
--- a/klm/util/mmap.cc
+++ b/klm/util/mmap.cc
@@ -14,12 +14,12 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdlib.h>
-#include <unistd.h>
 
 #if defined(_WIN32) || defined(_WIN64)
 #include <windows.h>
 #include <io.h>
 #else
+#include <unistd.h>
 #include <sys/mman.h>
 #endif
 
-- 
cgit v1.2.3


From 6fd22244aaa33cd5cbc4d9bd1003e6eef7b6e418 Mon Sep 17 00:00:00 2001
From: Kenneth Heafield <kheafiel@cluster01.lti.ece.cmu.local>
Date: Sun, 27 May 2012 15:05:56 -0400
Subject: Add example installing perl script

---
 Jamroot              | 2 ++
 jam-files/sanity.jam | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Jamroot b/Jamroot
index c2e250d0..87a5a53d 100644
--- a/Jamroot
+++ b/Jamroot
@@ -31,6 +31,8 @@ project : default-build <warnings>on <variant>release ;
 
 install-bin-libs dpmert//programs utils//programs mteval//programs klm/lm//programs training//liblbfgs decoder//cdec phrasinator//programs mira//kbest_mira ;
 
+install perl-scripts : dpmert//dpmert.pl : <location>$(bindir) ;
+
 build-projects mteval decoder dpmert klm/lm training/liblbfgs ;
 
 #Compile everything ending with _test.cc into a test and run it.
diff --git a/jam-files/sanity.jam b/jam-files/sanity.jam
index 4e0432f9..957f4f43 100644
--- a/jam-files/sanity.jam
+++ b/jam-files/sanity.jam
@@ -182,9 +182,10 @@ if $(prefix) {
 } else {
   prefix = $(TOP)/dist$(GITTAG) ;
 }
+
+bindir = [ option.get "bindir" : $(prefix)/bin ] ;
+libdir = [ option.get "libdir" : $(prefix)/lib ] ;
 rule install-bin-libs ( deps * ) {
-  local bindir = [ option.get "bindir" : $(prefix)/bin ] ;
-  local libdir = [ option.get "libdir" : $(prefix)/lib ] ;
   install prefix-bin : $(deps) : <location>$(bindir) <install-dependencies>on <install-type>EXE <link>shared:<dll-path>$(libdir) ;
   install prefix-lib : $(deps) : <location>$(libdir) <install-dependencies>on <install-type>LIB <link>shared:<dll-path>$(libdir) ;
 }
-- 
cgit v1.2.3