diff options
| author | Axel Beckert <abe@deuxchevaux.org> | 2016-01-31 20:20:28 +0100 |
|---|---|---|
| committer | Axel Beckert <abe@deuxchevaux.org> | 2016-01-31 20:22:02 +0100 |
| commit | da1b680be1e3307cc2c2de34b81be554f4a32be6 (patch) | |
| tree | e3b967df4179d87f45aeb6704ba1cc6f9d0acedb /debian/rules | |
| parent | 0013070a348a68ced5894522501ad3b17d26e7fb (diff) | |
| download | zsh-da1b680be1e3307cc2c2de34b81be554f4a32be6.tar.gz zsh-da1b680be1e3307cc2c2de34b81be554f4a32be6.zip | |
Remove usage of alternatives system for zsh, rzsh and zsh-static
This also fixes installation together with usrmerge, which fiddles
with the directory layout and makes /bin a symlink to /usr/bin against
all Unix tradition and violating FHS.
Closes: #768079
Diffstat (limited to 'debian/rules')
| -rwxr-xr-x | debian/rules | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/debian/rules b/debian/rules index afdf5406c..c94eef57f 100755 --- a/debian/rules +++ b/debian/rules @@ -127,7 +127,7 @@ binary-indep: build-indep binary-arch-dynamic /^#define FPATH_SUBDIRS/ { $$1=""; $$2=""; gsub(/[" ]/,""); tail=$$0; } \ END { printf "%s/%s\n", head, tail; };' \ obj/Src/zshpaths.h >obj/Src/zshpaths.temp - debian/zsh/bin/zsh5 -fc \ + debian/zsh/bin/zsh -fc \ 'setopt extendedglob; \ for i in debian/zsh-common/'`cat obj/Src/zshpaths.temp`'; do \ zcompile -U -M $$i.zwc $$i/*~*.zwc(^/); \ @@ -173,7 +173,6 @@ binary-arch-dynamic: build-arch cd obj && $(MAKE) install.bin DESTDIR=$(CURDIR)/debian/zsh INSTALL_PROGRAM='$(INSTALL_PROGRAM)' cd obj && $(MAKE) install.modules DESTDIR=$(CURDIR)/debian/zsh INSTALL_PROGRAM='$(INSTALL_PROGRAM)' - mv debian/zsh/bin/zsh debian/zsh/bin/zsh5 rm debian/zsh/bin/zsh-5.[0-9]* dh_bugfiles -pzsh @@ -204,7 +203,9 @@ binary-arch-static: build-static dh_install -pzsh-static dh_strip -pzsh-static - mv debian/zsh-static/bin/zsh debian/zsh-static/bin/zsh5-static + mv debian/zsh-static/bin/zsh debian/zsh-static/bin/zsh-static + mv debian/zsh-static/bin/zsh5 debian/zsh-static/bin/zsh5-static + sed -e 's:#!/bin/zsh:#!/bin/zsh-static:' -i debian/zsh-static/bin/zsh5-static dh_installchangelogs -pzsh-static |