From 9618702942cf4cc48f2cd6b61512679283325297 Mon Sep 17 00:00:00 2001
From: Greg Hudson <ghudson@mit.edu>
Date: Tue, 23 Sep 1997 15:26:36 +0000
Subject: confdir became sysconfdir. Rip out in-tree com_err support.

---
 server/Makefile.in | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

(limited to 'server/Makefile.in')

diff --git a/server/Makefile.in b/server/Makefile.in
index 9a4cf56..4feb618 100644
--- a/server/Makefile.in
+++ b/server/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@
 
@@ -17,12 +17,11 @@ BUILDTOP=..
 VPATH=@srcdir@
 CC=@CC@
 INSTALL=@INSTALL@
-COMPILE_ET=@COMPILE_ET@
 
 DEBUG=-O
-CFLAGS=${DEBUG} -DCONFDIR=\"${confdir}\" -I${top_srcdir}/h -I${BUILDTOP}/h \
-	 -I. @CPPFLAGS@
-LDFLAGS=${DEBUG} -L${BUILDTOP}/lib/zephyr @ET_LDFLAGS@ @LDFLAGS@
+CFLAGS=${DEBUG} -DSYSCONFDIR=\"${sysconfdir}\" -I${top_srcdir}/h \
+	-I${BUILDTOP}/h -I. @CPPFLAGS@
+LDFLAGS=${DEBUG} -L${BUILDTOP}/lib @LDFLAGS@
 LIBS=-lzephyr @LIBS@ -lcom_err
 
 OBJS=	zsrv_err.o access.o acl_files.o bdump.o class.o client.o common.o \
@@ -31,11 +30,11 @@ OBJS=	zsrv_err.o access.o acl_files.o bdump.o class.o client.o common.o \
 
 all: zephyrd
 
-zephyrd: ${OBJS} ${BUILDTOP}/lib/zephyr/libzephyr.a @ETDEP@
+zephyrd: ${OBJS} ${BUILDTOP}/lib/libzephyr.a
 	${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
 
 zsrv_err.c zsrv_err.h: zsrv_err.et
-	${COMPILE_ET} ${srcdir}/zsrv_err.et
+	compile_et ${srcdir}/zsrv_err.et
 
 version.o: version.h
 
@@ -48,10 +47,10 @@ check:
 install:
 	${INSTALL} -m 755 -s zephyrd ${DESTDIR}${sbindir}
 	${INSTALL} -m 644 ${srcdir}/zephyrd.8 ${DESTDIR}${mandir}/man8
-	${INSTALL} -m 644 ${srcdir}/default.subscriptions ${DESTDIR}${confdir}
-	rm -f ${DESTDIR}${confdir}/acl/?*.acl
-	cp ${srcdir}/acl/?*.acl ${DESTDIR}${confdir}/acl
-	chmod 644 ${DESTDIR}${confdir}/acl/*
+	${INSTALL} -m 644 ${srcdir}/default.subscriptions ${DESTDIR}${sysconfdir}
+	rm -f ${DESTDIR}${sysconfdir}/acl/?*.acl
+	cp ${srcdir}/acl/?*.acl ${DESTDIR}${sysconfdir}/acl
+	chmod 644 ${DESTDIR}${sysconfdir}/acl/*
 
 clean:
 	rm -f ${OBJS} zephyrd zsrv_err.[ch]
-- 
cgit v1.2.3