From: Clint Adams <schizo@debian.org>
To: zsh-workers@sunsite.auc.dk
Subject: PATCH: the transform saga, directories
Date: Mon, 6 Dec 1999 11:31:52 -0500 [thread overview]
Message-ID: <19991206113152.A25632@dman.com> (raw)
This unfortunately brings back my make hack in order to
transform fndir and MODDIR. I'm a little iffy about fndir since
it has its own configure switch and this makes the description
incorrect.
Index: configure.in
===================================================================
RCS file: /cvs/zsh/zsh/configure.in,v
retrieving revision 1.1.1.47
diff -u -r1.1.1.47 configure.in
--- configure.in 1999/12/06 04:33:04 1.1.1.47
+++ configure.in 1999/12/06 16:27:56
@@ -48,6 +48,15 @@
dnl Handle --program-prefix, --program-suffix, etc.
AC_ARG_PROGRAM
+u_ptn=`make -s -f - <<EOF
+all:
+ @echo ${program_transform_name}
+EOF
+`
+tzsh=`echo zsh | sed -e "${u_ptn}"`
+
+AC_SUBST(tzsh)dnl
+
dnl Do you want to debug zsh?
undefine([zsh-debug])dnl
AC_ARG_ENABLE(zsh-debug,
@@ -214,10 +223,10 @@
AC_ARG_ENABLE(fndir,
[ --enable-fndir=DIR where functions go (default DATADIR/zsh/functions)],
[if test $enableval = yes; then
- fndir=${datadir}/zsh/functions
+ fndir=${datadir}/${tzsh}/functions
else
fndir="$enableval"
-fi], [fndir=${datadir}/zsh/functions])
+fi], [fndir=${datadir}/${tzsh}/functions])
undefine([function_subdirs])
AC_ARG_ENABLE(function-subdirs,
Index: Config/defs.mk.in
===================================================================
RCS file: /cvs/zsh/zsh/Config/defs.mk.in,v
retrieving revision 1.1.1.3
diff -u -r1.1.1.3 defs.mk.in
--- Config/defs.mk.in 1999/06/18 10:55:49 1.1.1.3
+++ Config/defs.mk.in 1999/12/06 16:27:56
@@ -33,7 +33,7 @@
exec_prefix = @exec_prefix@
bindir = @bindir@
libdir = @libdir@
-MODDIR = $(libdir)/zsh/$(VERSION)
+MODDIR = $(libdir)/@tzsh@/$(VERSION)
infodir = @infodir@
mandir = @mandir@
fndir = @fndir@
Index: Doc/Makefile.in
===================================================================
RCS file: /cvs/zsh/zsh/Doc/Makefile.in,v
retrieving revision 1.1.1.33
diff -u -r1.1.1.33 Makefile.in
--- Doc/Makefile.in 1999/12/06 04:40:27 1.1.1.33
+++ Doc/Makefile.in 1999/12/06 16:27:56
@@ -168,14 +168,15 @@
install.man: $(MAN)
$(sdir_top)/mkinstalldirs $(DESTDIR)$(mandir)/man1
for file in $(MAN); do \
- tzsh=`echo $$file | sed '$(transform)'`; \
+ tzsh=`echo zsh | sed '$(transform)'`; \
+ tfile=`echo $$file | sed "s/zsh/$$tzsh/"`; \
if test -f $$file; then \
- cp -f $$file $$tzsh; \
+ cp -f $$file $$tfile; \
elif test -f $(sdir)/$$file; then \
- cp -f $(sdir)/$$file $$tzsh; \
+ cp -f $(sdir)/$$file $$tfile; \
else :; \
fi || exit 1; \
- $(INSTALL_DATA) $$tzsh $(DESTDIR)$(mandir)/man1 || exit 1; \
+ $(INSTALL_DATA) $$tfile $(DESTDIR)$(mandir)/man1 || exit 1; \
done
# install info pages, creating install directory if necessary
@@ -203,7 +204,8 @@
uninstall.man:
for file in $(MAN); do \
tzsh=`echo zsh | sed '$(transform)'`; \
- rm -f $(DESTDIR)$(mandir)/man1/$$tzsh; \
+ tfile=`echo $$file | sed "s/zsh/$$tzsh/"`; \
+ rm -f $(DESTDIR)$(mandir)/man1/$$tfile; \
done
# uninstall info pages
next reply other threads:[~1999-12-06 16:32 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
1999-12-06 16:31 Clint Adams [this message]
1999-12-06 17:06 ` Zefram
1999-12-06 18:39 ` Bart Schaefer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=19991206113152.A25632@dman.com \
--to=schizo@debian.org \
--cc=zsh-workers@sunsite.auc.dk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).