1
0
mirror of https://github.com/pdf2htmlEX/pdf2htmlEX.git synced 2024-12-22 04:50:09 +00:00

begun rearranging poppler-data-dir

This commit is contained in:
Stephen Gaito 2020-05-31 18:34:48 +00:00
parent 30ffdeeea4
commit 1b7bab3e2d
4 changed files with 19 additions and 3 deletions

View File

@ -27,7 +27,10 @@ make install DESTDIR=../../imageBuild/appDir
cd ../../poppler-data cd ../../poppler-data
make install prefix=$PDF2HTMLEX_PREFIX DESTDIR=../imageBuild/appDir make install \
prefix=$PDF2HTMLEX_PREFIX \
datadir=$PDF2HTMLEX_PREFIX/share/pdf2htmlEX \
DESTDIR=../imageBuild/appDir
cd ../imageBuild cd ../imageBuild

View File

@ -25,7 +25,10 @@ make install DESTDIR=../../imageBuild/dockerDir
cd ../../poppler-data cd ../../poppler-data
make install prefix=$PDF2HTMLEX_PREFIX DESTDIR=../imageBuild/dockerDir make install \
prefix=$PDF2HTMLEX_PREFIX \
datadir=$PDF2HTMLEX_PREFIX/share/pdf2htmlEX \
DESTDIR=../imageBuild/appDir
cd ../imageBuild/dockerDir cd ../imageBuild/dockerDir

View File

@ -20,3 +20,12 @@ fi
cd pdf2htmlEX/build cd pdf2htmlEX/build
sudo make install sudo make install
## NEED to install poppler-data!!!
#
cd ../../poppler-data
make install \
prefix=$PDF2HTMLEX_PREFIX \
datadir=$PDF2HTMLEX_PREFIX/share/pdf2htmlEX \
DESTDIR=../imageBuild/appDir

View File

@ -68,6 +68,7 @@ void show_version_and_exit(const char * dummy = nullptr)
cerr << " cairo " << cairo_version_string() << endl; cerr << " cairo " << cairo_version_string() << endl;
#endif #endif
cerr << "Default data-dir: " << param.data_dir << endl; cerr << "Default data-dir: " << param.data_dir << endl;
cerr << "Poppler data-dir: " << param.poppler_data_dir << endl;
cerr << "Supported image format:"; cerr << "Supported image format:";
#ifdef ENABLE_LIBPNG #ifdef ENABLE_LIBPNG
cerr << " png"; cerr << " png";
@ -378,7 +379,7 @@ int main(int argc, char **argv)
// //
param.data_dir = string(getenv("APPDIR")) + param.data_dir; param.data_dir = string(getenv("APPDIR")) + param.data_dir;
} }
param.poppler_data_dir = param.data_dir + "/poppler"
parse_options(argc, argv); parse_options(argc, argv);
check_param(); check_param();