# HG changeset patch
# User Chris Cannam
# Date 1545039098 0
# Node ID 720595a8fa105b9d4d7b10c993003daa8bd584e9
# Parent  48e746f45bdef3c582e9f4cf6354d55784cb4832
Avoid using directory name that clashes with intended executable name

diff -r 48e746f45bde -r 720595a8fa10 deploy/linux/docker/Dockerfile_appimage.in
--- 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
diff -r 48e746f45bde -r 720595a8fa10 deploy/linux/docker/Dockerfile_deb.in
--- 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