From 30a7ab55f1ceadd3811ed1c7ccd037bfe8f8d734 Mon Sep 17 00:00:00 2001 From: Greg Hudson Date: Tue, 23 Sep 1997 15:01:54 +0000 Subject: confdir became sysconfdir. Rip out support for in-tree com_err and ss. --- clients/syslogd/Makefile.in | 6 +++--- clients/xzwrite/Makefile.in | 8 +++----- clients/zaway/Makefile.in | 10 +++++----- clients/zctl/Makefile.in | 19 ++++--------------- clients/zleave/Makefile.in | 6 +++--- clients/zlocate/Makefile.in | 6 +++--- clients/zmailnotify/Makefile.in | 6 +++--- clients/znol/Makefile.in | 6 +++--- clients/zpopnotify/Makefile.in | 6 +++--- clients/zshutdown_notify/Makefile.in | 6 +++--- clients/zstat/Makefile.in | 6 +++--- clients/zwrite/Makefile.in | 8 ++++---- 12 files changed, 40 insertions(+), 53 deletions(-) (limited to 'clients') diff --git a/clients/syslogd/Makefile.in b/clients/syslogd/Makefile.in index 15c64da..8f1cea8 100644 --- a/clients/syslogd/Makefile.in +++ b/clients/syslogd/Makefile.in @@ -3,7 +3,7 @@ SHELL = /bin/sh prefix=@prefix@ exec_prefix=@exec_prefix@ datadir=@datadir@ -confdir=@confdir@ +sysconfdir=@sysconfdir@ sbindir=@sbindir@ lsbindir=@lsbindir@ @@ -21,14 +21,14 @@ INSTALL=@INSTALL@ DEBUG=-O CFLAGS=${DEBUG} -I${srcdir} -I${top_srcdir}/h -I${BUILDTOP}/h @CPPFLAGS@ -LDFLAGS=${DEBUG} -L${BUILDTOP}/lib/zephyr @ET_LDFLAGS@ @LDFLAGS@ +LDFLAGS=${DEBUG} -L${BUILDTOP}/lib @LDFLAGS@ LIBS=-lzephyr @LIBS@ -lcom_err @SLIB@ OBJS= syslogd.o all: syslogd -syslogd: ${OBJS} ${BUILDTOP}/lib/zephyr/libzephyr.a @ETDEP@ +syslogd: ${OBJS} ${BUILDTOP}/lib/libzephyr.a ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS} check: diff --git a/clients/xzwrite/Makefile.in b/clients/xzwrite/Makefile.in index 9d706b6..995c543 100644 --- a/clients/xzwrite/Makefile.in +++ b/clients/xzwrite/Makefile.in @@ -3,7 +3,7 @@ SHELL = /bin/sh prefix=@prefix@ exec_prefix=@exec_prefix@ datadir=@datadir@ -confdir=@confdir@ +sysconfdir=@sysconfdir@ sbindir=@sbindir@ lsbindir=@lsbindir@ @@ -22,8 +22,7 @@ INSTALL=@INSTALL@ DEBUG=-O CFLAGS=${DEBUG} -DDATADIR=\"${datadir}\" -I${top_srcdir}/h \ -I${BUILDTOP}/h @X_CFLAGS@ @CPPFLAGS@ -LDFLAGS=${DEBUG} -L${BUILDTOP}/lib/zephyr -L${BUILDTOP}/lib/dyn @ET_LDFLAGS@ \ - @X_LIBS@ @LDFLAGS@ +LDFLAGS=${DEBUG} -L${BUILDTOP}/lib -L${BUILDTOP}/libdyn @X_LIBS@ @LDFLAGS@ LIBS=-lzephyr -ldyn -lXaw -lXmu -lXt @X_PRE_LIBS@ -lX11 -lXext @X_EXTRA_LIBS@ \ @LIBS@ -lcom_err @@ -33,8 +32,7 @@ OBJS= interface.o resource.o destlist.o util.o bfgets.o gethomedir.o \ all: xzwrite -xzwrite: ${OBJS} ${BUILDTOP}/lib/zephyr/libzephyr.a \ - ${BUILDTOP}/lib/dyn/libdyn.a @ETDEP@ +xzwrite: ${OBJS} ${BUILDTOP}/lib/libzephyr.a ${BUILDTOP}/libdyn/libdyn.a ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS} check: diff --git a/clients/zaway/Makefile.in b/clients/zaway/Makefile.in index 64db77d..314d38d 100644 --- a/clients/zaway/Makefile.in +++ b/clients/zaway/Makefile.in @@ -3,7 +3,7 @@ SHELL = /bin/sh prefix=@prefix@ exec_prefix=@exec_prefix@ datadir=@datadir@ -confdir=@confdir@ +sysconfdir=@sysconfdir@ sbindir=@sbindir@ lsbindir=@lsbindir@ @@ -21,21 +21,21 @@ INSTALL=@INSTALL@ DEBUG=-O CFLAGS=${DEBUG} -I${top_srcdir}/h -I${BUILDTOP}/h @CPPFLAGS@ -LDFLAGS=${DEBUG} -L${BUILDTOP}/lib/zephyr @ET_LDFLAGS@ @LDFLAGS@ +LDFLAGS=${DEBUG} -L${BUILDTOP}/lib @LDFLAGS@ LIBS=-lzephyr @LIBS@ -lcom_err OBJS= zaway.o all: zaway -zaway: ${OBJS} ${BUILDTOP}/lib/zephyr/libzephyr.a @ETDEP@ +zaway: ${OBJS} ${BUILDTOP}/lib/libzephyr.a ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS} check: install: zaway - ${INSTALL} -m 755 -s zaway ${bindir} - ${INSTALL} -m 644 ${srcdir}/zaway.1 ${mandir}/man1 + ${INSTALL} -m 755 -s zaway ${DESTDIR}${bindir} + ${INSTALL} -m 644 ${srcdir}/zaway.1 ${DESTDIR}${mandir}/man1 clean: rm -f ${OBJS} zaway diff --git a/clients/zctl/Makefile.in b/clients/zctl/Makefile.in index c9fb8d0..40ac4f4 100644 --- a/clients/zctl/Makefile.in +++ b/clients/zctl/Makefile.in @@ -3,7 +3,7 @@ SHELL = /bin/sh prefix=@prefix@ exec_prefix=@exec_prefix@ datadir=@datadir@ -confdir=@confdir@ +sysconfdir=@sysconfdir@ sbindir=@sbindir@ lsbindir=@lsbindir@ @@ -18,32 +18,21 @@ BUILDTOP=../.. VPATH=@srcdir@ CC=@CC@ INSTALL=@INSTALL@ -MK_CMDS=@MK_CMDS@ DEBUG=-O CFLAGS=${DEBUG} -I${top_srcdir}/h -I${BUILDTOP}/h @X_CFLAGS@ @CPPFLAGS@ -LDFLAGS=${DEBUG} -L${BUILDTOP}/lib/zephyr @ET_LDFLAGS@ @SS_LDFLAGS@ @LDFLAGS@ +LDFLAGS=${DEBUG} -L${BUILDTOP}/lib @LDFLAGS@ LIBS=-lzephyr -lss @LIBS@ -lcom_err OBJS= zctl.o zctl_cmds.o all: zctl -zctl: ${OBJS} ${BUILDTOP}/lib/zephyr/libzephyr.a @ETDEP@ @SSDEP@ +zctl: ${OBJS} ${BUILDTOP}/lib/libzephyr.a ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS} -# The Athena mk_cmds insists on writing output to source directory. Bleah. -# After the patch to fix it goes into an Athena release, replace it with: -# ${MK_CMDS} ${srcdir}/zctl_cmds.ct zctl_cmds.c: zctl_cmds.ct - cp ${srcdir}/zctl_cmds.ct /tmp/zctl_cmds.$$$$.ct; \ - ${MK_CMDS} /tmp/zctl_cmds.$$$$.ct; \ - if [ -f /tmp/zctl_cmds.$$$$.c ]; then \ - mv /tmp/zctl_cmds.$$$$.c zctl_cmds.c; \ - else \ - mv zctl_cmds.$$$$.c zctl_cmds.c; \ - fi; \ - rm -f /tmp/zctl_cmds.$$$$.ct + mk_cmds ${srcdir}/zctl_cmds.ct check: diff --git a/clients/zleave/Makefile.in b/clients/zleave/Makefile.in index 367ce8d..e452681 100644 --- a/clients/zleave/Makefile.in +++ b/clients/zleave/Makefile.in @@ -3,7 +3,7 @@ SHELL = /bin/sh prefix=@prefix@ exec_prefix=@exec_prefix@ datadir=@datadir@ -confdir=@confdir@ +sysconfdir=@sysconfdir@ sbindir=@sbindir@ lsbindir=@lsbindir@ @@ -21,14 +21,14 @@ INSTALL=@INSTALL@ DEBUG=-O CFLAGS=${DEBUG} -I${top_srcdir}/h -I${BUILDTOP}/h @CPPFLAGS@ -LDFLAGS=${DEBUG} -L${BUILDTOP}/lib/zephyr @ET_LDFLAGS@ @LDFLAGS@ +LDFLAGS=${DEBUG} -L${BUILDTOP}/lib @LDFLAGS@ LIBS=-lzephyr @LIBS@ -lcom_err OBJS= zleave.o all: zleave -zleave: ${OBJS} ${BUILDTOP}/lib/zephyr/libzephyr.a @ETDEP@ +zleave: ${OBJS} ${BUILDTOP}/lib/libzephyr.a ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS} check: diff --git a/clients/zlocate/Makefile.in b/clients/zlocate/Makefile.in index 403578d..49c3414 100644 --- a/clients/zlocate/Makefile.in +++ b/clients/zlocate/Makefile.in @@ -3,7 +3,7 @@ SHELL = /bin/sh prefix=@prefix@ exec_prefix=@exec_prefix@ datadir=@datadir@ -confdir=@confdir@ +sysconfdir=@sysconfdir@ sbindir=@sbindir@ lsbindir=@lsbindir@ @@ -21,14 +21,14 @@ INSTALL=@INSTALL@ DEBUG=-g CFLAGS=${DEBUG} -I${top_srcdir}/h -I${BUILDTOP}/h @CPPFLAGS@ -LDFLAGS=${DEBUG} -L${BUILDTOP}/lib/zephyr @ET_LDFLAGS@ @LDFLAGS@ +LDFLAGS=${DEBUG} -L${BUILDTOP}/lib @LDFLAGS@ LIBS=-lzephyr @LIBS@ -lcom_err OBJS= zlocate.o all: zlocate -zlocate: ${OBJS} ${BUILDTOP}/lib/zephyr/libzephyr.a @ETDEP@ +zlocate: ${OBJS} ${BUILDTOP}/lib/libzephyr.a ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS} check: diff --git a/clients/zmailnotify/Makefile.in b/clients/zmailnotify/Makefile.in index a742bc9..ec5d117 100644 --- a/clients/zmailnotify/Makefile.in +++ b/clients/zmailnotify/Makefile.in @@ -3,7 +3,7 @@ SHELL = /bin/sh prefix=@prefix@ exec_prefix=@exec_prefix@ datadir=@datadir@ -confdir=@confdir@ +sysconfdir=@sysconfdir@ sbindir=@sbindir@ lsbindir=@lsbindir@ @@ -21,14 +21,14 @@ INSTALL=@INSTALL@ DEBUG=-O CFLAGS=${DEBUG} -I${top_srcdir}/h -I${BUILDTOP}/h -DKPOP @CPPFLAGS@ -LDFLAGS=${DEBUG} -L${BUILDTOP}/lib/zephyr @ET_LDFLAGS@ @LDFLAGS@ +LDFLAGS=${DEBUG} -L${BUILDTOP}/lib @LDFLAGS@ LIBS=-lzephyr @LIBS@ -lcom_err OBJS= zmailnotify.o all: zmailnotify -zmailnotify: ${OBJS} ${BUILDTOP}/lib/zephyr/libzephyr.a @ETDEP@ +zmailnotify: ${OBJS} ${BUILDTOP}/lib/libzephyr.a ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS} check: diff --git a/clients/znol/Makefile.in b/clients/znol/Makefile.in index 597ab3f..f9bab22 100644 --- a/clients/znol/Makefile.in +++ b/clients/znol/Makefile.in @@ -3,7 +3,7 @@ SHELL = /bin/sh prefix=@prefix@ exec_prefix=@exec_prefix@ datadir=@datadir@ -confdir=@confdir@ +sysconfdir=@sysconfdir@ sbindir=@sbindir@ lsbindir=@lsbindir@ @@ -21,14 +21,14 @@ INSTALL=@INSTALL@ DEBUG=-O CFLAGS=${DEBUG} -I${top_srcdir}/h -I${BUILDTOP}/h @CPPFLAGS@ -LDFLAGS=${DEBUG} -L${BUILDTOP}/lib/zephyr @ET_LDFLAGS@ @LDFLAGS@ +LDFLAGS=${DEBUG} -L${BUILDTOP}/lib @LDFLAGS@ LIBS=-lzephyr @LIBS@ -lcom_err OBJS= znol.o all: znol -znol: ${OBJS} ${BUILDTOP}/lib/zephyr/libzephyr.a @ETDEP@ +znol: ${OBJS} ${BUILDTOP}/lib/libzephyr.a ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS} check: diff --git a/clients/zpopnotify/Makefile.in b/clients/zpopnotify/Makefile.in index ca38dd7..0156c35 100644 --- a/clients/zpopnotify/Makefile.in +++ b/clients/zpopnotify/Makefile.in @@ -3,7 +3,7 @@ SHELL = /bin/sh prefix=@prefix@ exec_prefix=@exec_prefix@ datadir=@datadir@ -confdir=@confdir@ +sysconfdir=@sysconfdir@ sbindir=@sbindir@ lsbindir=@lsbindir@ @@ -21,14 +21,14 @@ INSTALL=@INSTALL@ DEBUG=-O CFLAGS=${DEBUG} -I${top_srcdir}/h -I${BUILDTOP}/h @CPPFLAGS@ -LDFLAGS=${DEBUG} -L${BUILDTOP}/lib/zephyr @ET_LDFLAGS@ @LDFLAGS@ +LDFLAGS=${DEBUG} -L${BUILDTOP}/lib @LDFLAGS@ LIBS=-lzephyr @LIBS@ -lcom_err OBJS= zpopnotify.o all: zpopnotify -zpopnotify: ${OBJS} ${BUILDTOP}/lib/zephyr/libzephyr.a @ETDEP@ +zpopnotify: ${OBJS} ${BUILDTOP}/lib/libzephyr.a ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS} check: diff --git a/clients/zshutdown_notify/Makefile.in b/clients/zshutdown_notify/Makefile.in index 0fb5922..8935127 100644 --- a/clients/zshutdown_notify/Makefile.in +++ b/clients/zshutdown_notify/Makefile.in @@ -3,7 +3,7 @@ SHELL = /bin/sh prefix=@prefix@ exec_prefix=@exec_prefix@ datadir=@datadir@ -confdir=@confdir@ +sysconfdir=@sysconfdir@ sbindir=@sbindir@ lsbindir=@lsbindir@ @@ -21,14 +21,14 @@ INSTALL=@INSTALL@ DEBUG=-O CFLAGS=${DEBUG} -I${top_srcdir}/h -I${BUILDTOP}/h @CPPFLAGS@ -LDFLAGS=${DEBUG} -L${BUILDTOP}/lib/zephyr @ET_LDFLAGS@ @LDFLAGS@ +LDFLAGS=${DEBUG} -L${BUILDTOP}/lib @LDFLAGS@ LIBS=-lzephyr @LIBS@ -lcom_err OBJS= zshutdown_notify.o all: zshutdown_notify -zshutdown_notify: ${OBJS} ${BUILDTOP}/lib/zephyr/libzephyr.a @ETDEP@ +zshutdown_notify: ${OBJS} ${BUILDTOP}/lib/libzephyr.a ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS} check: diff --git a/clients/zstat/Makefile.in b/clients/zstat/Makefile.in index 11b2f92..e11dfcb 100644 --- a/clients/zstat/Makefile.in +++ b/clients/zstat/Makefile.in @@ -3,7 +3,7 @@ SHELL = /bin/sh prefix=@prefix@ exec_prefix=@exec_prefix@ datadir=@datadir@ -confdir=@confdir@ +sysconfdir=@sysconfdir@ sbindir=@sbindir@ lsbindir=@lsbindir@ @@ -21,14 +21,14 @@ INSTALL=@INSTALL@ DEBUG=-O CFLAGS=${DEBUG} -I${top_srcdir}/h -I${BUILDTOP}/h @CPPFLAGS@ -LDFLAGS=${DEBUG} -L${BUILDTOP}/lib/zephyr @ET_LDFLAGS@ @LDFLAGS@ +LDFLAGS=${DEBUG} -L${BUILDTOP}/lib @LDFLAGS@ LIBS=-lzephyr @LIBS@ -lcom_err OBJS= zstat.o all: zstat -zstat: ${OBJS} ${BUILDTOP}/lib/zephyr/libzephyr.a @ETDEP@ +zstat: ${OBJS} ${BUILDTOP}/lib/libzephyr.a ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS} check: diff --git a/clients/zwrite/Makefile.in b/clients/zwrite/Makefile.in index 9319c24..fdfc487 100644 --- a/clients/zwrite/Makefile.in +++ b/clients/zwrite/Makefile.in @@ -1,9 +1,9 @@ -SHELL = /bin/sh +'SHELL = /bin/sh prefix=@prefix@ exec_prefix=@exec_prefix@ datadir=@datadir@ -confdir=@confdir@ +sysconfdir=@sysconfdir@ sbindir=@sbindir@ lsbindir=@lsbindir@ @@ -21,14 +21,14 @@ INSTALL=@INSTALL@ DEBUG=-O CFLAGS=${DEBUG} -I${top_srcdir}/h -I${BUILDTOP}/h @CPPFLAGS@ -LDFLAGS=${DEBUG} -L${BUILDTOP}/lib/zephyr @ET_LDFLAGS@ @LDFLAGS@ +LDFLAGS=${DEBUG} -L${BUILDTOP}/lib @LDFLAGS@ LIBS=-lzephyr @LIBS@ -lcom_err OBJS= zwrite.o all: zwrite -zwrite: ${OBJS} ${BUILDTOP}/lib/zephyr/libzephyr.a @ETDEP@ +zwrite: ${OBJS} ${BUILDTOP}/lib/libzephyr.a ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS} check: -- cgit v1.2.3