diff --git a/buildScripts/buildFontforge b/buildScripts/buildFontforge index a2f75b3..c41fd68 100755 --- a/buildScripts/buildFontforge +++ b/buildScripts/buildFontforge @@ -40,7 +40,7 @@ cd fontforge ./bootstrap ./configure \ - --prefix=/usr/local \ + --prefix=$PDF2HTMLEX_PREFIX \ --enable-python-scripting=3 \ --disable-dependency-tracking \ --disable-silent-rules \ diff --git a/buildScripts/buildInstallLocallyApt b/buildScripts/buildInstallLocallyApt index 49ba59c..75b45bd 100755 --- a/buildScripts/buildInstallLocallyApt +++ b/buildScripts/buildInstallLocallyApt @@ -13,6 +13,8 @@ export MAKE_PARALLEL="-j $(nproc)" export PDF2HTMLEX_BRANCH=update-poppler # export PDF2HTMLEX_BRANCH="$(git rev-parse --abbrev-ref HEAD)" +export PDF2HTMLEX_PREFIX=/usr/local + ################ # do the build diff --git a/buildScripts/buildInstallLocallyBrew b/buildScripts/buildInstallLocallyBrew index aa32c7c..1cb4849 100755 --- a/buildScripts/buildInstallLocallyBrew +++ b/buildScripts/buildInstallLocallyBrew @@ -13,6 +13,8 @@ export MAKE_PARALLEL="-j $(nproc)" export PDF2HTMLEX_BRANCH=update-poppler # export PDF2HTMLEX_BRANCH="$(git rev-parse --abbrev-ref HEAD)" +export PDF2HTMLEX_PREFIX=toBeDetermined + ################ # do the build diff --git a/buildScripts/buildPdf2htmlEX b/buildScripts/buildPdf2htmlEX index 1d49382..cf6dd00 100755 --- a/buildScripts/buildPdf2htmlEX +++ b/buildScripts/buildPdf2htmlEX @@ -11,5 +11,5 @@ echo "" cd pdf2htmlEX mkdir build cd build -cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local .. +cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PDF2HTMLEX_PREFIX .. make $MAKE_PARALLEL diff --git a/buildScripts/buildPdf2htmlEXClang b/buildScripts/buildPdf2htmlEXClang index 3ea3a3f..eb65509 100755 --- a/buildScripts/buildPdf2htmlEXClang +++ b/buildScripts/buildPdf2htmlEXClang @@ -11,5 +11,5 @@ echo "" cd pdf2htmlEX mkdir build cd build -CC=clang CXX=clang++ cmake -DCMAKE_INSTALL_PREFIX=/usr/local .. +CC=clang CXX=clang++ cmake -DCMAKE_INSTALL_PREFIX=$PDF2HTMLEX_PREFIX .. make $MAKE_PARALLEL diff --git a/buildScripts/buildPoppler b/buildScripts/buildPoppler index baf305b..9845412 100755 --- a/buildScripts/buildPoppler +++ b/buildScripts/buildPoppler @@ -11,10 +11,6 @@ echo "" cd poppler mkdir build cd build -cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local \ +cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PDF2HTMLEX_PREFIX \ -DENABLE_LIBOPENJPEG=none .. make $MAKE_PARALLEL - -cd ../../poppler-data - -make install prefix=/usr/local diff --git a/buildScripts/createAppImage b/buildScripts/createAppImage index 6fe9eb8..796567a 100755 --- a/buildScripts/createAppImage +++ b/buildScripts/createAppImage @@ -41,11 +41,11 @@ wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/$LI chmod a+x $LINUX_DEPLOY_APP_IMAGE -./$LINUX_DEPLOY_APP_IMAGE \ - -e appDir/usr/local/bin/pdf2htmlEX \ - --create-desktop-file \ - -i ../pdf2htmlEX/logo/pdf2htmlEX.svg \ - --appdir=appDir \ +./$LINUX_DEPLOY_APP_IMAGE \ + -e appDir/$PDF2HTMLEX_PREFIX/bin/pdf2htmlEX \ + --create-desktop-file \ + -i ../pdf2htmlEX/logo/pdf2htmlEX.svg \ + --appdir=appDir \ --output appimage diff --git a/buildScripts/createDockerImage b/buildScripts/createDockerImage index e31daa4..a075492 100755 --- a/buildScripts/createDockerImage +++ b/buildScripts/createDockerImage @@ -62,7 +62,7 @@ echo "export DOCKER_NAME=\"$DOCKER_NAME\"" >> buildScripts/reSourceVersi FROM $DOCKER_FROM COPY ./ / RUN ldconfig -ENTRYPOINT ["/usr/local/bin/pdf2htmlEX"] +ENTRYPOINT ["$PDF2HTMLEX_PREFIX/bin/pdf2htmlEX"] DOCKERFILE_HERE_DOC cd .. diff --git a/buildScripts/installPoppler b/buildScripts/installPoppler index 2ae5b15..42ce6ce 100755 --- a/buildScripts/installPoppler +++ b/buildScripts/installPoppler @@ -26,17 +26,22 @@ sudo make install cd .. -sudo mkdir -p /usr/local/include/poppler -sudo cp poppler/*.h /usr/local/include/poppler +sudo mkdir -p $PDF2HTMLEX_PREFIX/include/poppler +sudo cp poppler/*.h $PDF2HTMLEX_PREFIX/include/poppler -sudo mkdir -p /usr/local/include/poppler/goo -sudo cp goo/*.h /usr/local/include/poppler/goo +sudo mkdir -p $PDF2HTMLEX_PREFIX/include/poppler/goo +sudo cp goo/*.h $PDF2HTMLEX_PREFIX/include/poppler/goo -sudo mkdir -p /usr/local/include/poppler/fofi -sudo cp fofi/*.h /usr/local/include/poppler/fofi +sudo mkdir -p $PDF2HTMLEX_PREFIX/include/poppler/fofi +sudo cp fofi/*.h $PDF2HTMLEX_PREFIX/include/poppler/fofi -sudo mkdir -p /usr/local/include/poppler/splash -sudo cp splash/*.h /usr/local/include/poppler/splash +sudo mkdir -p $PDF2HTMLEX_PREFIX/include/poppler/splash +sudo cp splash/*.h $PDF2HTMLEX_PREFIX/include/poppler/splash sudo cp build/poppler/poppler-config.h \ - /usr/local/include/poppler + $PDF2HTMLEX_PREFIX/include/poppler + +cd ../poppler-data + +sudo make install prefix=$PDF2HTMLEX_PREFIX +