diff options
| -rw-r--r-- | clients/zctl/Makefile.in | 13 | ||||
| -rw-r--r-- | clients/zctl/zctl.1.in (renamed from clients/zctl/zctl.1) | 4 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | server/Makefile.in | 13 | ||||
| -rw-r--r-- | server/zephyrd.8.in (renamed from server/zephyrd.8) | 23 | ||||
| -rw-r--r-- | zhm/Makefile.in | 13 | ||||
| -rw-r--r-- | zhm/zhm.8.in (renamed from zhm/zhm.8) | 2 | ||||
| -rw-r--r-- | zwgc/Makefile.in | 13 | ||||
| -rw-r--r-- | zwgc/zwgc.1.in (renamed from zwgc/zwgc.1) | 13 |
9 files changed, 71 insertions, 26 deletions
diff --git a/clients/zctl/Makefile.in b/clients/zctl/Makefile.in index 105fe10..fa8d4ae 100644 --- a/clients/zctl/Makefile.in +++ b/clients/zctl/Makefile.in @@ -22,6 +22,12 @@ LIBTOOL=@LIBTOOL@ CC=@CC@ INSTALL=@INSTALL@ +editman = sed \ + -e 's|@datadir[@]|${datadir}|g' \ + -e 's|@sysconfdir[@]|${sysconfdir}|g' \ + -e 's|@sbindir[@]|${sbindir}|g' \ + -e 's|@lsbindir[@]|${lsbindir}|g' + LIBZEPHYR=${BUILDTOP}/lib/libzephyr.la CPPFLAGS=@CPPFLAGS@ CFLAGS=@CFLAGS@ @@ -32,7 +38,7 @@ LIBS=${LIBZEPHYR} @SS_LIBS@ @LIBS@ -lcom_err SS_OBJS=zctl_cmds.o OBJS= zctl.o @SS_OBJS@ -all: zctl +all: zctl zctl.1 zctl: ${OBJS} ${LIBZEPHYR} ${LIBTOOL} --mode=link ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS} @@ -43,6 +49,10 @@ zctl_cmds.c: zctl_cmds.ct .c.o: ${CC} -c ${ALL_CFLAGS} $< +zctl.1: ${srcdir}/zctl.1.in Makefile + ${editman} ${srcdir}/$@.in > $@.tmp + mv $@.tmp $@ + check: install: zctl @@ -52,6 +62,7 @@ install: zctl clean: ${LIBTOOL} --mode=clean rm -f zctl rm -f ${OBJS} zctl_cmds.c + rm -f zctl.1 ${OBJS}: ${top_srcdir}/h/sysdep.h ${BUILDTOP}/h/config.h ${OBJS}: ${BUILDTOP}/h/zephyr/zephyr.h ${BUILDTOP}/h/zephyr/zephyr_err.h diff --git a/clients/zctl/zctl.1 b/clients/zctl/zctl.1.in index c94bbf9..d3835d3 100644 --- a/clients/zctl/zctl.1 +++ b/clients/zctl/zctl.1.in @@ -143,7 +143,7 @@ Any variable settings you make will be stored in \fI$HOME/.zephyr.vars\fR .B show \fIvar\fR [ \fIvar\fR \ ... ] Show the value of the specified Zephyr variables. If a variable is not defined in the user's own variables file, the system variables file -(\fI/etc/athena/zephyr.vars\fR) is searched for a default value. +(\fI@sysconfdir@/zephyr/zephyr.vars\fR) is searched for a default value. .TP .B subscribe \fIclass instance\fR [ \fIrecipient\fR ] Subscribe to \fIclass, instance, recipient\fR, but don't add this triplet to @@ -298,7 +298,7 @@ $HOME/.zephyr.subs .br $ZEPHYR_VARS or $HOME/.zephyr.vars .br -/etc/athena/zephyr.vars +@sysconfdir@/zephyr/zephyr.vars .SH AUTHOR .PP Robert S. French (MIT-Project Athena) diff --git a/configure.ac b/configure.ac index 96e8c52..7278b41 100644 --- a/configure.ac +++ b/configure.ac @@ -397,4 +397,5 @@ AC_OUTPUT(Makefile clients/Makefile clients/zaway/Makefile clients/zlocate/Makefile clients/znol/Makefile clients/zshutdown_notify/Makefile clients/zstat/Makefile clients/zwrite/Makefile lib/Makefile - server/Makefile zhm/Makefile zwgc/Makefile) + server/Makefile zhm/Makefile zwgc/Makefile + ) diff --git a/server/Makefile.in b/server/Makefile.in index 7d244be..dc51a96 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -21,6 +21,12 @@ LIBTOOL=@LIBTOOL@ CC=@CC@ INSTALL=@INSTALL@ +editman = sed \ + -e 's|@datadir[@]|${datadir}|g' \ + -e 's|@sysconfdir[@]|${sysconfdir}|g' \ + -e 's|@sbindir[@]|${sbindir}|g' \ + -e 's|@lsbindir[@]|${lsbindir}|g' + LIBZEPHYR=${BUILDTOP}/lib/libzephyr.la CPPFLAGS=@CPPFLAGS@ CFLAGS=@CFLAGS@ @@ -34,7 +40,7 @@ OBJS= zsrv_err.o access.o acl_files.o bdump.o class.o client.o common.o \ dispatch.o kstuff.o main.o server.o subscr.o timer.o uloc.o \ zstring.o realm.o version.o utf8proc.o -all: zephyrd +all: zephyrd zephyrd.8 zephyrd: ${OBJS} ${LIBZEPHYR} ${LIBTOOL} --mode=link ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS} ${HESIOD_LIBS} @@ -46,6 +52,10 @@ zsrv_err.c: zsrv_err.et .c.o: ${CC} -c ${ALL_CFLAGS} $< +zephyrd.8: ${srcdir}/zephyrd.8.in Makefile + ${editman} ${srcdir}/$@.in > $@.tmp + mv $@.tmp $@ + check: # No dependency on zephyrd, to avoid rebuilding version.o. @@ -59,6 +69,7 @@ install: clean: ${LIBTOOL} --mode=clean rm -f zephyrd rm -f ${OBJS} zsrv_err.[ch] + rm -f zephyrd.8 ${OBJS}: zserver.h zsrv_err.h timer.h zsrv_conf.h zstring.h access.h acl.h ${OBJS}: ${top_srcdir}/h/internal.h ${top_srcdir}/h/sysdep.h diff --git a/server/zephyrd.8 b/server/zephyrd.8.in index abd1d6b..eef9780 100644 --- a/server/zephyrd.8 +++ b/server/zephyrd.8.in @@ -9,7 +9,7 @@ .SH NAME zephyrd \- Zephyr server daemon .SH SYNOPSIS -.I /usr/etc/zephyrd +.I @sbindir@/zephyrd [ .BI \-d ] @@ -79,29 +79,32 @@ class must be authenticated. The class registry lists all classes which are restricted. .SH FILES .TP 10 -.I /etc/zephyr/acl/class-registry.acl: +.I @sysconfdir@/zephyr/acl/class-registry.acl: List of classes which are restricted .TP -.I /etc/zephyr/acl/iws-*.acl: +.I @sysconfdir@/zephyr/acl/iws-*.acl: Access Control Lists for instance-wildcard restrictions .TP -.I /etc/zephyr/acl/iui-*.acl: +.I @sysconfdir@/zephyr/acl/iui-*.acl: Access Control Lists for instance-identity restrictions .TP -.I /etc/zephyr/acl/sub-*.acl: +.I @sysconfdir@/zephyr/acl/sub-*.acl: Access Control Lists for subscribing .TP -.I /etc/zephyr/acl/xmt-*.acl: +.I @sysconfdir@/zephyr/acl/xmt-*.acl: Access Control Lists for transmitting .TP -.I /etc/zephyr/srvtab: +.I @sysconfdir@/zephyr/srvtab: Kerberos 4 Service keys .TP -.I /etc/zephyr/krb5.keytab: +.I @sysconfdir@/zephyr/krb5.keytab: Kerberos V Service keys .TP -.I /etc/zephyr/ztkts: -Current Kerberos tickets for exchange with other servers +.I /var/run/zephyrd.tkt4: +Current Kerberos 4 tickets for exchange with other servers +.TP +.I /var/run/zephyrd.tkt: +Current Kerberos 5 tickets for exchange with other servers .TP .I /var/tmp/zephyr.db: File containing an ASCII dump of the database. diff --git a/zhm/Makefile.in b/zhm/Makefile.in index 801575d..cbaf6ab 100644 --- a/zhm/Makefile.in +++ b/zhm/Makefile.in @@ -21,6 +21,12 @@ LIBTOOL=@LIBTOOL@ CC=@CC@ INSTALL=@INSTALL@ +editman = sed \ + -e 's|@datadir[@]|${datadir}|g' \ + -e 's|@sysconfdir[@]|${sysconfdir}|g' \ + -e 's|@sbindir[@]|${sbindir}|g' \ + -e 's|@lsbindir[@]|${lsbindir}|g' + LIBZEPHYR=${BUILDTOP}/lib/libzephyr.la CPPFLAGS=@CPPFLAGS@ CFLAGS=@CFLAGS@ @@ -30,11 +36,15 @@ HESIOD_LIBS=@HESIOD_LIBS@ OBJS= timer.o queue.o zhm.o zhm_client.o zhm_server.o -all: zhm +all: zhm zhm.8 zhm: ${OBJS} ${LIBZEPHYR} ${LIBTOOL} --mode=link ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBZEPHYR} ${HESIOD_LIBS} -lcom_err +zhm.8: ${srcdir}/zhm.8.in Makefile + ${editman} ${srcdir}/$@.in > $@.tmp + mv $@.tmp $@ + .c.o: ${CC} -c ${ALL_CFLAGS} $< @@ -47,6 +57,7 @@ install: zhm clean: ${LIBTOOL} --mode=clean rm -f zhm rm -f ${OBJS} + rm -f zhm.8 ${OBJS}: zhm.h timer.h ${top_srcdir}/h/internal.h ${top_srcdir}/h/sysdep.h ${OBJS}: ${BUILDTOP}/h/config.h ${BUILDTOP}/h/zephyr/zephyr.h @@ -10,7 +10,7 @@ .SH NAME zhm \- Zephyr HostManager .SH SYNOPSIS -.B /usr/sbin/zhm +.B @lsbindir@/zhm [ .BI -d ] [ diff --git a/zwgc/Makefile.in b/zwgc/Makefile.in index 63c77c2..595ab99 100644 --- a/zwgc/Makefile.in +++ b/zwgc/Makefile.in @@ -24,6 +24,12 @@ YACC=@YACC@ INSTALL=@INSTALL@ INSTANTIATE=${srcdir}/instantiate +editman = sed \ + -e 's|@datadir[@]|${datadir}|g' \ + -e 's|@sysconfdir[@]|${sysconfdir}|g' \ + -e 's|@sbindir[@]|${sbindir}|g' \ + -e 's|@lsbindir[@]|${lsbindir}|g' + LIBZEPHYR=${BUILDTOP}/lib/libzephyr.la CPPFLAGS=@CPPFLAGS@ CFLAGS=@CFLAGS@ @@ -43,7 +49,7 @@ OBJS= port_dictionary.o pointer_dictionary.o unsigned_long_dictionary.o \ standard_ports.o xselect.o xmark.o xrevstack.o xerror.o \ new_string.o new_memory.o plus.o -all: zwgc +all: zwgc zwgc.1 zwgc: ${OBJS} ${LIBZEPHYR} ${LIBTOOL} --mode=link ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS} @@ -84,6 +90,10 @@ y.tab.c y.tab.h: ${srcdir}/parser.y .c.o: ${CC} -c ${ALL_CFLAGS} $< +zwgc.1: ${srcdir}/zwgc.1.in Makefile + ${editman} ${srcdir}/$@.in > $@.tmp + mv $@.tmp $@ + check: install: zwgc @@ -98,6 +108,7 @@ clean: rm -f unsigned_long_dictionary.[ch] string_dictionary.[ch] rm -f int_dictionary.[ch] char_stack.h string_stack.h xmode_stack.h rm -f y.tab.[ch] + rm -f zwgc.1 ${OBJS}: ${top_srcdir}/h/sysdep.h ${BUILDTOP}/h/config.h zephyr.o: ${BUILDTOP}/h/zephyr/zephyr.h ${BUILDTOP}/h/zephyr/zephyr_err.h diff --git a/zwgc/zwgc.1 b/zwgc/zwgc.1.in index d2d597c..88a7ba4 100644 --- a/zwgc/zwgc.1 +++ b/zwgc/zwgc.1.in @@ -913,10 +913,7 @@ used by reverseStack. .SH COMMAND LINE .I zwgc is normally invoked from -.IR /usr/athena/lib/init/login , -.IR $HOME/.xsession , -or -.I /usr/athena/lib/init/xsession +.IR $HOME/.xsession in the foreground. When it has successfully set your location and obtained subscriptions, it will put itself into the background (unless the \-nofork option has been specified). At this point it is safe to @@ -1013,9 +1010,9 @@ Other control messages may be implemented in the future. .SH EXAMPLES For an example of a description file, see -.IR /usr/athena/share/zephyr/zwgc.desc . +.IR @datadir@/zephyr/zwgc.desc . For an example of X resources, see -.IR /usr/athena/share/zephyr/zwgc_resources . +.IR @datadir@/zephyr/zwgc_resources . .SH BUGS The X selection code can highlight the wrong portions of messages @@ -1034,10 +1031,10 @@ which case you must get new tickets and then run ``zctl load $HOME/.zwgc.desc Default location of user's description file .TP -/usr/athena/share/zephyr/zwgc.desc +@datadir@/zephyr/zwgc.desc System-wide description file .TP -/usr/athena/share/zephyr/zwgc_resources +@datadir@/zephyr/zwgc_resources Default X application resources. .TP $ZEPHYR_VARS or $HOME/.zephyr.vars |