diff --git a/CMakeLists.txt b/CMakeLists.txt index 713a52e..2472991 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,5 +39,5 @@ add_executable(pdf2htmlEX target_link_libraries(pdf2htmlEX poppler boost_program_options boost_filesystem boost_system) install (TARGETS pdf2htmlEX DESTINATION bin) -file (GLOB libfiles lib/*) -install (FILES ${libfiles} DESTINATION lib/pdf2htmlEX) +file (GLOB datafiles share/*) +install (FILES ${datafiles} DESTINATION share/pdf2htmlEX) diff --git a/lib/all.css b/share/all.css similarity index 100% rename from lib/all.css rename to share/all.css diff --git a/lib/head.html b/share/head.html similarity index 100% rename from lib/head.html rename to share/head.html diff --git a/lib/neck.html b/share/neck.html similarity index 100% rename from lib/neck.html rename to share/neck.html diff --git a/lib/tail.html b/share/tail.html similarity index 100% rename from lib/tail.html rename to share/tail.html diff --git a/src/HTMLRenderer/general.cc b/src/HTMLRenderer/general.cc index 422538c..0b27149 100644 --- a/src/HTMLRenderer/general.cc +++ b/src/HTMLRenderer/general.cc @@ -112,19 +112,19 @@ void HTMLRenderer::pre_process() html_fout.open(dest_dir / param->output_filename, ofstream::binary); allcss_fout.open(dest_dir / CSS_FILENAME, ofstream::binary); - html_fout << ifstream(PDF2HTMLEX_LIB_PATH / HEAD_HTML_FILENAME, ifstream::binary).rdbuf(); + html_fout << ifstream(PDF2HTMLEX_DATA_PATH / HEAD_HTML_FILENAME, ifstream::binary).rdbuf(); html_fout << "" << endl; - html_fout << ifstream(PDF2HTMLEX_LIB_PATH / NECK_HTML_FILENAME, ifstream::binary).rdbuf(); + html_fout << ifstream(PDF2HTMLEX_DATA_PATH / NECK_HTML_FILENAME, ifstream::binary).rdbuf(); } - allcss_fout << ifstream(PDF2HTMLEX_LIB_PATH / CSS_FILENAME, ifstream::binary).rdbuf(); + allcss_fout << ifstream(PDF2HTMLEX_DATA_PATH / CSS_FILENAME, ifstream::binary).rdbuf(); } void HTMLRenderer::post_process() { if(!param->single_html) { - html_fout << ifstream(PDF2HTMLEX_LIB_PATH / TAIL_HTML_FILENAME, ifstream::binary).rdbuf(); + html_fout << ifstream(PDF2HTMLEX_DATA_PATH / TAIL_HTML_FILENAME, ifstream::binary).rdbuf(); } html_fout.close(); @@ -195,17 +195,17 @@ void HTMLRenderer::process_single_html() { ofstream out (dest_dir / param->output_filename, ofstream::binary); - out << ifstream(PDF2HTMLEX_LIB_PATH / HEAD_HTML_FILENAME , ifstream::binary).rdbuf(); + out << ifstream(PDF2HTMLEX_DATA_PATH / HEAD_HTML_FILENAME , ifstream::binary).rdbuf(); out << "" << endl; - out << ifstream(PDF2HTMLEX_LIB_PATH / NECK_HTML_FILENAME, ifstream::binary).rdbuf(); + out << ifstream(PDF2HTMLEX_DATA_PATH / NECK_HTML_FILENAME, ifstream::binary).rdbuf(); out << ifstream(tmp_dir / (param->output_filename + ".part"), ifstream::binary).rdbuf(); - out << ifstream(PDF2HTMLEX_LIB_PATH / TAIL_HTML_FILENAME, ifstream::binary).rdbuf(); + out << ifstream(PDF2HTMLEX_DATA_PATH / TAIL_HTML_FILENAME, ifstream::binary).rdbuf(); } void HTMLRenderer::add_tmp_file(const string & fn) diff --git a/src/config.h.in b/src/config.h.in index d02324a..e637de3 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -14,7 +14,7 @@ static const std::string PDF2HTMLEX_VERSION = "@PDF2HTMLEX_VERSION@"; static const std::string PDF2HTMLEX_PREFIX = "@CMAKE_INSTALL_PREFIX@"; -static const boost::filesystem::path PDF2HTMLEX_LIB_PATH = boost::filesystem::path(PDF2HTMLEX_PREFIX) / "lib" / "pdf2htmlEX"; +static const boost::filesystem::path PDF2HTMLEX_DATA_PATH = boost::filesystem::path(PDF2HTMLEX_PREFIX) / "share" / "pdf2htmlEX"; #endif //CONFIG_H__ diff --git a/src/pdf2htmlEX.cc b/src/pdf2htmlEX.cc index fe74c91..20f1ced 100644 --- a/src/pdf2htmlEX.cc +++ b/src/pdf2htmlEX.cc @@ -172,7 +172,7 @@ int main(int argc, char **argv) //prepare the directories for(const auto & p : {param.dest_dir, param.tmp_dir}) { - if(equivalent(PDF2HTMLEX_LIB_PATH, p)) + if(equivalent(PDF2HTMLEX_DATA_PATH, p)) { cerr << "The specified directory \"" << p << "\" is the library path for pdf2htmlEX. Please use another one." << endl; return -1;