Mercurial > hg > easyhg
changeset 726:720595a8fa10
Avoid using directory name that clashes with intended executable name
author | Chris Cannam |
---|---|
date | Mon, 17 Dec 2018 09:31:38 +0000 |
parents | 48e746f45bde |
children | bd9a54f9aca8 |
files | deploy/linux/docker/Dockerfile_appimage.in deploy/linux/docker/Dockerfile_deb.in |
diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/deploy/linux/docker/Dockerfile_appimage.in Mon Dec 17 09:25:11 2018 +0000 +++ b/deploy/linux/docker/Dockerfile_appimage.in Mon Dec 17 09:31:38 2018 +0000 @@ -47,8 +47,8 @@ RUN qmake -r RUN make -RUN hg clone https://code.soundsoftware.ac.uk/hg/easyhg-kdiff3 -WORKDIR easyhg-kdiff3/kdiff3/src-QT4 +RUN hg clone https://code.soundsoftware.ac.uk/hg/easyhg-kdiff3-src +WORKDIR easyhg-kdiff3-src/kdiff3/src-QT4 RUN qmake -r kdiff3.pro RUN make RUN cp kdiff3 ../../../easyhg-kdiff3
--- a/deploy/linux/docker/Dockerfile_deb.in Mon Dec 17 09:25:11 2018 +0000 +++ b/deploy/linux/docker/Dockerfile_deb.in Mon Dec 17 09:31:38 2018 +0000 @@ -39,8 +39,8 @@ RUN qmake -r RUN make -RUN hg clone https://code.soundsoftware.ac.uk/hg/easyhg-kdiff3 -WORKDIR easyhg-kdiff3/kdiff3/src-QT4 +RUN hg clone https://code.soundsoftware.ac.uk/hg/easyhg-kdiff3-src +WORKDIR easyhg-kdiff3-src/kdiff3/src-QT4 RUN qmake -r kdiff3.pro RUN make RUN cp kdiff3 ../../../easyhg-kdiff3