diff options
| author | Craig Earls <enderw88@gmail.com> | 2013-11-06 08:48:54 -0700 |
|---|---|---|
| committer | Craig Earls <enderw88@gmail.com> | 2013-11-06 08:48:54 -0700 |
| commit | 1db0b0892c2e382cd2f437434f8338861740e0dd (patch) | |
| tree | 85c4277a61f594066ac4f1553852bf2d6e8718bd | |
| parent | 52228e7cc15fd87abe234e92b7c2da15c2abf5a6 (diff) | |
| parent | d51e6f32d7c16f0d6760df6f8d83cd18db55c597 (diff) | |
| download | fork-ledger-1db0b0892c2e382cd2f437434f8338861740e0dd.tar.gz fork-ledger-1db0b0892c2e382cd2f437434f8338861740e0dd.tar.bz2 fork-ledger-1db0b0892c2e382cd2f437434f8338861740e0dd.zip | |
Merge branch 'master' into ledger-mode-automatic-transactions
| -rw-r--r-- | doc/CMakeLists.txt | 15 | ||||
| -rw-r--r-- | lisp/ledger-mode.el | 2 | ||||
| -rw-r--r-- | src/account.h | 2 | ||||
| -rw-r--r-- | src/commodity.h | 2 |
4 files changed, 11 insertions, 10 deletions
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 275678a8..2777da68 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -96,10 +96,11 @@ if(CMAKE_INSTALL_MANDIR) DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT doc) endif(CMAKE_INSTALL_MANDIR) -if(CMAKE_INSTALL_DOCDIR) - foreach(file ${info_files}) - get_filename_component(file_base ${file} NAME_WE) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${file_base}.pdf - DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT doc OPTIONAL) - endforeach() -endif(CMAKE_INSTALL_DOCDIR) +foreach(file ${info_files}) + get_filename_component(file_base ${file} NAME_WE) + + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${file} + DESTINATION ${CMAKE_INSTALL_INFODIR} COMPONENT doc) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${file_base}.pdf + DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT doc OPTIONAL) +endforeach() diff --git a/lisp/ledger-mode.el b/lisp/ledger-mode.el index be1a7775..a8a448b8 100644 --- a/lisp/ledger-mode.el +++ b/lisp/ledger-mode.el @@ -295,6 +295,6 @@ Can indent, complete or align depending on context." -(provide 'ledger) +(provide 'ledger-mode) ;;; ledger-mode.el ends here diff --git a/src/account.h b/src/account.h index daeee038..b726facf 100644 --- a/src/account.h +++ b/src/account.h @@ -310,7 +310,7 @@ void put_account(property_tree::ptree& pt, const account_t& acct, //simple struct added to allow std::map to compare accounts in the accounts report struct account_compare { - bool operator() (const account_t& lhs, const account_t& rhs){ + bool operator() (const account_t& lhs, const account_t& rhs) const { return (lhs.fullname().compare(rhs.fullname()) < 0); } }; diff --git a/src/commodity.h b/src/commodity.h index a1988a3b..d521d80e 100644 --- a/src/commodity.h +++ b/src/commodity.h @@ -353,7 +353,7 @@ void put_commodity(property_tree::ptree& pt, const commodity_t& comm, //simple struct to allow std::map to compare commodities names struct commodity_compare { - bool operator() (const commodity_t* lhs, const commodity_t* rhs){ + bool operator() (const commodity_t* lhs, const commodity_t* rhs) const { return (lhs->symbol().compare(rhs->symbol()) < 0); } }; |