720595a8fa10 — Chris Cannam 2 years ago
Avoid using directory name that clashes with intended executable name
2 files changed, 4 insertions(+), 4 deletions(-)

M deploy/linux/docker/Dockerfile_appimage.in
M deploy/linux/docker/Dockerfile_deb.in
M deploy/linux/docker/Dockerfile_appimage.in +2 -2
@@ 47,8 47,8 @@ ENV PATH /opt/qt510/bin:$PATH
 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

          
M deploy/linux/docker/Dockerfile_deb.in +2 -2
@@ 39,8 39,8 @@ WORKDIR /easyhg
 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