Update installation for Ubuntu 12.04. Addresses build issue in wavii#11.

jasonm · May 13, 2013 · 98098c8 · 98098c8
1 parent 9468a5d
commit 98098c8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -19,7 +19,7 @@ ELSE(APPLE)
    ADD_DEFINITIONS(-Wall -O3 -DNDEBUG -march=native -mtune=native `getconf LFS_CFLAGS`)
 ENDIF(APPLE)
 
-INCLUDE_DIRECTORIES(include /usr/include/python2.6)
+INCLUDE_DIRECTORIES(include /usr/include/python2.7)
 
 ADD_EXECUTABLE(test
                src/test/lexicon.cpp
@@ -55,7 +55,7 @@ IF(APPLE)
    TARGET_LINK_LIBRARIES(pfpc pfp boost_filesystem-mt boost_thread-mt boost_regex-mt boost_system-mt icuio)
    TARGET_LINK_LIBRARIES(pfpc_token pfp boost_filesystem-mt boost_thread-mt boost_regex-mt boost_system-mt icuio)
    TARGET_LINK_LIBRARIES(test pfp boost_thread-mt boost_unit_test_framework-mt boost_regex-mt icuio)
-   TARGET_LINK_LIBRARIES(pfp boost_filesystem-mt boost_thread-mt boost_regex-mt boost_system-mt icuio icuuc)
+   TARGET_LINK_LIBRARIES(test pfp boost_filesystem boost_thread boost_unit_test_framework boost_regex boost_system icuio icuuc)
 ELSE(APPLE)
    TARGET_LINK_LIBRARIES(pfpd pfp boost_filesystem boost_thread boost_regex boost_system icuio icuuc)
    TARGET_LINK_LIBRARIES(pfpc pfp boost_filesystem boost_thread boost_regex boost_system icuio icuuc)

diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ pfp is a **pretty fast statistical parser** for probabilistic context free gramm
 
 ## Installing
 
-The following works on **Ubuntu 10.04 LTS**:
+The following works on **Ubuntu 12.04 LTS**:
 
     sudo apt-get install -y git-core cmake build-essential libboost-all-dev python-dev
     git clone http://github.com/wavii/pfp.git && cd pfp