From 1ea6ad909a8b8fa39537bde3b0d131f8c3817fb5 Mon Sep 17 00:00:00 2001 From: Tanaka Akira Date: Mon, 6 Dec 1999 04:33:02 +0000 Subject: manual/8903 --- Doc/.cvsignore | 3 +-- Doc/.distfiles | 4 ++-- Doc/Makefile.in | 45 ++++++++++++++++++++++++--------------------- Makefile.in | 3 --- Src/Makefile.in | 24 +++++++++++++----------- configure.in | 10 ---------- 6 files changed, 40 insertions(+), 49 deletions(-) diff --git a/Doc/.cvsignore b/Doc/.cvsignore index c8a68f7a7..386da0724 100644 --- a/Doc/.cvsignore +++ b/Doc/.cvsignore @@ -1,8 +1,7 @@ Makefile version.yo -zsh.yo zsh*.1 -zsh.texi +zsh.texi* zsh.info* zsh_*.html zsh.aux zsh.toc diff --git a/Doc/.distfiles b/Doc/.distfiles index 427ded62c..5dd643049 100644 --- a/Doc/.distfiles +++ b/Doc/.distfiles @@ -2,10 +2,10 @@ DISTFILES_SRC=' .cvsignore .distfiles Makefile.in META-FAQ.yo intro.ms version.yo zmacros.yo zman.yo ztexi.yo - zsh.yo.in zshbuiltins.yo zshcompctl.yo zshcompsys.yo zshcompwid.yo + zsh.yo zshbuiltins.yo zshcompctl.yo zshcompsys.yo zshcompwid.yo zshexpn.yo zshmisc.yo zshmodules.yo zshoptions.yo zshparam.yo zshzftpsys.yo zshzle.yo - zsh.texi + zsh.texi.in zsh.1 zshbuiltins.1 zshcompctl.1 zshcompsys.1 zshcompwid.1 zshexpn.1 zshmisc.1 zshmodules.1 zshoptions.1 zshparam.1 zshzle.1 zshall.1 zshzftpsys.1 diff --git a/Doc/Makefile.in b/Doc/Makefile.in index b35ca33c0..e74ef4e28 100644 --- a/Doc/Makefile.in +++ b/Doc/Makefile.in @@ -35,8 +35,6 @@ sdir = @srcdir@ sdir_top = @top_srcdir@ INSTALL = @INSTALL@ -tzsh = @tzsh@ - @DEFS_MK@ MAKEINFO = makeinfo @@ -52,7 +50,7 @@ zshexpn.1 zshmisc.1 zshmodules.1 \ zshoptions.1 zshparam.1 zshzftpsys.1 zshzle.1 zshall.1 # yodl documentation -YODLDOC = $(MAN) zsh.texi +YODLDOC = $(MAN) zsh.texi.in YODLSRC = zmacros.yo zman.yo ztexi.yo Zsh/arith.yo Zsh/builtins.yo \ Zsh/compat.yo Zsh/compctl.yo Zsh/compsys.yo Zsh/compwid.yo Zsh/cond.yo \ Zsh/exec.yo Zsh/expn.yo \ @@ -68,22 +66,21 @@ Zsh/seealso.yo Zsh/zftpsys.yo Zsh/zle.yo # ========== DEPENDENCIES FOR BUILDING ========== -all: $(MAN) zsh.texi $(tzsh).info ../META-FAQ +transform = @program_transform_name@ + +all: $(MAN) zsh.texi zsh.info ../META-FAQ everything: all zsh.dvi zsh_us.ps zsh_a4.ps zsh_toc.html zsh.dvi: zsh.texi - $(TEXI2DVI) $(sdir)/zsh.texi + $(TEXI2DVI) zsh.texi -%.info: zsh.texi - $(MAKEINFO) $(sdir)/zsh.texi || exit 0 +zsh.texi.in: $(sdir)/zsh.yo + $(YODL) -o $(sdir)/zsh.texi.in -I$(sdir) -w ztexi.yo version.yo zsh.yo -zsh.texi: $(sdir)/zsh.yo - $(YODL) -o $(sdir)/zsh.texi -I$(sdir) -w ztexi.yo version.yo zsh.yo - test -f $(sdir)/zsh.texi - -$(sdir)/zsh.yo: $(sdir)/zsh.yo.in - sed 's,@@TEXINFO@@,texinfo\($(tzsh).info\)\($(tzsh)\),' $(sdir)/zsh.yo.in > $(sdir)/zsh.yo +zsh.texi: zsh.texi.in + @test -f $(sdir)/zsh.texi.in -a -s $(sdir)/zsh.texi.in + sed '/@setfilename/{; s/@setfilename //; $(transform) ; s/^/@setfilename /;}' < $(sdir)/zsh.texi > zsh.texi .yo.1: case $@ in \ @@ -171,27 +168,31 @@ uninstall: uninstall.man install.man: $(MAN) $(sdir_top)/mkinstalldirs $(DESTDIR)$(mandir)/man1 for file in $(MAN); do \ + tzsh=`echo $$file | sed '$(transform)'`; \ if test -f $$file; then \ - $(INSTALL_DATA) $$file $(DESTDIR)$(mandir)/man1; \ + cp -f $$file $$tzsh; \ elif test -f $(sdir)/$$file; then \ - $(INSTALL_DATA) $(sdir)/$$file $(DESTDIR)$(mandir)/man1; \ + cp -f $(sdir)/$$file $$tzsh; \ else :; \ fi || exit 1; \ + $(INSTALL_DATA) $$tzsh $(DESTDIR)$(mandir)/man1 || exit 1; \ done # install info pages, creating install directory if necessary -install.info: $(tzsh).info +install.info: zsh.texi + $(MAKEINFO) zsh.texi $(sdir_top)/mkinstalldirs $(DESTDIR)$(infodir) - for file in $(tzsh).info $(tzsh).info-[1-9]*; do \ + tzsh=`echo zsh.info | sed '$(transform)'`; \ + for file in $$tzsh $$tzsh-[1-9]*; do \ if test -f $$file; then \ $(INSTALL_DATA) $$file $(DESTDIR)$(infodir); \ elif test -f $(sdir)/$$file; then \ $(INSTALL_DATA) $(sdir)/$$file $(DESTDIR)$(infodir); \ else :; \ fi || exit 1; \ - done + done; \ if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \ - install-info --dir-file=$(DESTDIR)$(infodir)/dir $(DESTDIR)$(infodir)/$(tzsh).info; \ + install-info --dir-file=$(DESTDIR)$(infodir)/dir $(DESTDIR)$(infodir)/$$tzsh.info; \ else true; fi install.html: zsh_toc.html @@ -201,12 +202,14 @@ install.html: zsh_toc.html # uninstall man pages uninstall.man: for file in $(MAN); do \ - rm -f $(DESTDIR)$(mandir)/man1/$$file; \ + tzsh=`echo zsh | sed '$(transform)'`; \ + rm -f $(DESTDIR)$(mandir)/man1/$$tzsh; \ done # uninstall info pages uninstall.info: - rm -f $(DESTDIR)$(infodir)/$(tzsh).info $(DESTDIR)$(infodir)/$(tzsh).info-[1-9]* + tzsh=`echo zsh | sed '$(transform)'`; \ + rm -f $(DESTDIR)$(infodir)/$$tzsh.info $(DESTDIR)$(infodir)/$$tzsh.info-[1-9]* # ========== DEPENDENCIES FOR CLEANUP ========== diff --git a/Makefile.in b/Makefile.in index 2724ba5a8..72bc98df9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -38,9 +38,6 @@ INSTALL = @INSTALL@ @DEFS_MK@ -transform = @program_transform_name@ -tzsh = @tzsh@ - # ========== DEPENDENCIES FOR BUILDING ========== # default target diff --git a/Src/Makefile.in b/Src/Makefile.in index 1cff00435..f99e2c965 100644 --- a/Src/Makefile.in +++ b/Src/Makefile.in @@ -42,8 +42,6 @@ LN = @LN@ sdir_src = $(sdir) dir_src = . -tzsh = @tzsh@ - # ========= DEPENDENCIES FOR BUILDING ========== LINK = $(CC) $(LDFLAGS) $(EXELDFLAGS) $(EXTRA_LDFLAGS) -o $@ @@ -152,6 +150,8 @@ ansi2knr: ansi2knr.o # ========== DEPENDENCIES FOR INSTALLING ========== +transform = @program_transform_name@ + install: install.bin install.modules uninstall: uninstall.bin uninstall.modules @@ -161,14 +161,15 @@ uninstall.bin: uninstall.bin-here # install binary, creating install directory if necessary install.bin-here: zsh install.bin-@L@ $(sdir_top)/mkinstalldirs $(DESTDIR)$(bindir) - $(INSTALL_PROGRAM) $(STRIPFLAGS) zsh $(DESTDIR)$(bindir)/$(tzsh)-$(VERSION) - if test -f $(DESTDIR)$(bindir)/$(tzsh); then \ - rm -f $(DESTDIR)$(bindir)/$(tzsh).old; \ - $(LN) $(DESTDIR)$(bindir)/$(tzsh) $(DESTDIR)$(bindir)/$(tzsh).old; \ - else :; fi - rm -f $(DESTDIR)$(bindir)/$(tzsh).new - $(LN) $(DESTDIR)$(bindir)/$(tzsh)-$(VERSION) $(DESTDIR)$(bindir)/$(tzsh).new - mv $(DESTDIR)$(bindir)/$(tzsh).new $(DESTDIR)$(bindir)/$(tzsh) + tzsh=`echo zsh | sed '$(transform)'`; \ + $(INSTALL_PROGRAM) $(STRIPFLAGS) zsh $(DESTDIR)$(bindir)/$$tzsh-$(VERSION) && \ + if test -f $(DESTDIR)$(bindir)/$$tzsh; then \ + rm -f $(DESTDIR)$(bindir)/$$tzsh.old; \ + $(LN) $(DESTDIR)$(bindir)/$$tzsh $(DESTDIR)$(bindir)/$$tzsh.old; \ + else :; fi && \ + rm -f $(DESTDIR)$(bindir)/$$tzsh.new && \ + $(LN) $(DESTDIR)$(bindir)/$$tzsh-$(VERSION) $(DESTDIR)$(bindir)/$$tzsh.new && \ + mv $(DESTDIR)$(bindir)/$$tzsh.new $(DESTDIR)$(bindir)/$$tzsh install.bin-N: install.bin-L: $(LIBZSH) @@ -177,7 +178,8 @@ install.bin-L: $(LIBZSH) # uninstall binary uninstall.bin-here: uninstall.bin-@L@ - rm -f $(DESTDIR)$(bindir)/$(tzsh)-$(VERSION) $(DESTDIR)$(bindir)/$(tzsh) + tzsh=`echo zsh | sed '$(transform)'`; \ + rm -f $(DESTDIR)$(bindir)/$$tzsh-$(VERSION) $(DESTDIR)$(bindir)/$$tzsh uninstall.bin-N: uninstall.bin-L: diff --git a/configure.in b/configure.in index 935bebb25..de8d06dc0 100644 --- a/configure.in +++ b/configure.in @@ -48,15 +48,6 @@ dnl ----------------------------- dnl Handle --program-prefix, --program-suffix, etc. AC_ARG_PROGRAM -u_ptn=`make -s -f - <