Mercurial > hg-stable
changeset 34625:f1c2552c2de7
build: "make deb" failed when the base path contained spaces
With these changes, all the commands triggered by "make deb" use proper quoting
and succeed even when invoked from a directory containing spaces.
| author | muxator <a.mux@inwind.it> |
|---|---|
| date | Wed, 11 Oct 2017 01:47:00 +0200 |
| parents | 884855ce5e63 |
| children | ff4c9c6263de |
| files | contrib/builddeb contrib/debian/rules |
| diffstat | 2 files changed, 17 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/builddeb Wed Oct 11 02:06:12 2017 +0200 +++ b/contrib/builddeb Wed Oct 11 01:47:00 2017 +0200 @@ -73,7 +73,7 @@ exit 1 fi - cp -r $PWD/contrib/debian debian + cp -r "$PWD"/contrib/debian debian sed -i.tmp "s/__VERSION__/$debver/" $changelog sed -i.tmp "s/__DATE__/$(date --rfc-2822)/" $changelog
--- a/contrib/debian/rules Wed Oct 11 02:06:12 2017 +0200 +++ b/contrib/debian/rules Wed Oct 11 01:47:00 2017 +0200 @@ -15,30 +15,30 @@ find debian/mercurial/usr/share -type d -empty -delete override_dh_install: - python$(PYVERS) setup.py install --root $(CURDIR)/debian/mercurial --install-layout=deb + python$(PYVERS) setup.py install --root "$(CURDIR)"/debian/mercurial --install-layout=deb # chg make -C contrib/chg \ - DESTDIR=$(CURDIR)/debian/mercurial \ + DESTDIR="$(CURDIR)"/debian/mercurial \ PREFIX=/usr \ clean install # remove arch-independent python stuff - find $(CURDIR)/debian/mercurial/usr/lib \ + find "$(CURDIR)"/debian/mercurial/usr/lib \ ! -name '*.so' ! -type d -delete , \ -type d -empty -delete - python$(PYVERS) setup.py install --root $(CURDIR)/debian/mercurial-common --install-layout=deb - make install-doc PREFIX=$(CURDIR)/debian/mercurial-common/usr + python$(PYVERS) setup.py install --root "$(CURDIR)/debian/mercurial-common" --install-layout=deb + make install-doc PREFIX="$(CURDIR)"/debian/mercurial-common/usr # remove arch-dependent python stuff - find $(CURDIR)/debian/mercurial-common/usr/lib \ + find "$(CURDIR)"/debian/mercurial-common/usr/lib \ -name '*.so' ! -type d -delete , \ -type d -empty -delete - cp contrib/hg-ssh $(CURDIR)/debian/mercurial-common/usr/bin - mkdir -p $(CURDIR)/debian/mercurial-common/usr/share/mercurial - cp contrib/hgk $(CURDIR)/debian/mercurial-common/usr/share/mercurial - mkdir -p $(CURDIR)/debian/mercurial-common/etc/mercurial/hgrc.d/ - cp contrib/debian/*.rc $(CURDIR)/debian/mercurial-common/etc/mercurial/hgrc.d/ + cp contrib/hg-ssh "$(CURDIR)"/debian/mercurial-common/usr/bin + mkdir -p "$(CURDIR)"/debian/mercurial-common/usr/share/mercurial + cp contrib/hgk "$(CURDIR)"/debian/mercurial-common/usr/share/mercurial + mkdir -p "$(CURDIR)"/debian/mercurial-common/etc/mercurial/hgrc.d/ + cp contrib/debian/*.rc "$(CURDIR)"/debian/mercurial-common/etc/mercurial/hgrc.d/ # completions - mkdir -p $(CURDIR)/debian/mercurial-common/usr/share/bash-completion/completions - cp contrib/bash_completion $(CURDIR)/debian/mercurial-common/usr/share/bash-completion/completions/hg - mkdir -p $(CURDIR)/debian/mercurial-common/usr/share/zsh/vendor-completions - cp contrib/zsh_completion $(CURDIR)/debian/mercurial-common/usr/share/zsh/vendor-completions/_hg - rm $(CURDIR)/debian/mercurial-common/usr/bin/hg + mkdir -p "$(CURDIR)"/debian/mercurial-common/usr/share/bash-completion/completions + cp contrib/bash_completion "$(CURDIR)"/debian/mercurial-common/usr/share/bash-completion/completions/hg + mkdir -p "$(CURDIR)"/debian/mercurial-common/usr/share/zsh/vendor-completions + cp contrib/zsh_completion "$(CURDIR)"/debian/mercurial-common/usr/share/zsh/vendor-completions/_hg + rm "$(CURDIR)"/debian/mercurial-common/usr/bin/hg