[6799] in Athena Bugs
Imakefile patch to not use local ncs (lp quota)
daemon@ATHENA.MIT.EDU (daemon@ATHENA.MIT.EDU)
Fri Jan 4 15:41:31 1991
Date: Fri, 4 Jan 91 15:41:00 -0500
From: "Barr3y Jaspan" <bjaspan@ATHENA.MIT.EDU>
To: bugs@ATHENA.MIT.EDU
I made the following changes to lpr/quota so that it would the Ultrix
version of Apollo's ncs, instead of the (non-public) version in the
Athena source tree.
o added LOCAL_NCS define to Imakefile, left it undefined, set up make
macros accordingly
o HACK! Created ppfm.h -> /usr/include/idl/c/pfm.h since ppfm.h
doesn't seem to exist. Probably won't work. (It seems to be. --Ed)
o HACK! Changed local copy of idl_base.h so the compiler won't choke
on rpc_$unmarshall_ulong_int -- the Ultrix version typecasts the lhs
of an assignment.
There are also a couple other changes here, mostly dealing with
pathname differences.
*** /tmp/,RCSt1a07423 Fri Jan 4 15:38:45 1991
--- Imakefile Thu Jan 3 18:05:26 1991
***************
*** 1,7 ****
! /* # $Source: /source/lpr/quota/RCS/Imakefile,v $
# $Author: epeisach $
# $Locker: $
! # $Header: /source/lpr/quota/RCS/Imakefile,v 1.3 90/11/15 19:34:38 epeisach Audited $
#
#
# Copyright 1990 Massachusetts Institute of Technology.
--- 1,7 ----
! /* # $Source: /afs/rel-eng.athena.mit.edu/project/lpr/src/quota/RCS/Imakefile,v $
# $Author: epeisach $
# $Locker: $
! # $Header: /afs/rel-eng.athena.mit.edu/project/lpr/src/quota/RCS/Imakefile,v 1.3 90/11/15 19:34:38 epeisach Audited $
#
#
# Copyright 1990 Massachusetts Institute of Technology.
***************
*** 12,25 ****
DESTDIR=
/* NDBM is now in config.h */
! CFLAGS=-O -DHESIOD -DKERBEROS -DZEPHYR -DV1COMPAT ${OCFLAGS}\
! -I./ncs/include/idl -I. -I..
LIBS= ${OPTLIBFLAGS} ./ncs/nck/libnck.a -lhesiod -lzephyr -lacl -lkrb \
-ldes -lcom_err ${DBMLIB} ${POSTLIBFLAGS}
DBLIBS = ${OPTLIBFLAGS} -lkrb ${DBMLIB} ${POSTLIBFLAGS}
#if defined(ultrix)
#if defined(ULTRIX40)
OCFLAGS=-DUltrix40
#else
--- 12,38 ----
DESTDIR=
+ /* Define LOCAL_NCS if you are using an ncs tree rooted at ./ncs. */
+ /* #define LOCAL_NCS */
+
/* NDBM is now in config.h */
!
! #ifdef LOCAL_NCS
! CFLAGS=-g -DHESIOD -DKERBEROS -DZEPHYR -DV1COMPAT ${OCFLAGS}\
! -I./ncs/include/idl -I. -I.. ${DEBUG}
LIBS= ${OPTLIBFLAGS} ./ncs/nck/libnck.a -lhesiod -lzephyr -lacl -lkrb \
-ldes -lcom_err ${DBMLIB} ${POSTLIBFLAGS}
+ #else
+ CFLAGS=-g -DHESIOD -DKERBEROS -DZEPHYR -DV1COMPAT ${OCFLAGS} \
+ -I. -I.. -I/usr/include/idl/c ${DEBUG}
+ LIBS= ${OPTLIBFLAGS} -lnck -lhesiod -lzephyr -lacl -lkrb \
+ -ldes -lcom_err ${DBMLIB} ${POSTLIBFLAGS}
+ #endif /* LOCAL_NCS */
+
DBLIBS = ${OPTLIBFLAGS} -lkrb ${DBMLIB} ${POSTLIBFLAGS}
#if defined(ultrix)
+ OPTLIBFLAGS=-L/usr/athena/lib
#if defined(ULTRIX40)
OCFLAGS=-DUltrix40
#else
***************
*** 36,45 ****
--- 49,69 ----
POSTLIBFLAGS=-lbsd
#endif
+ #ifdef LOCAL_NCS
NIDL=./ncs/nidl/nidl
NIDLOPTS=-idir ./ncs/include/idl -m
+ #else
+ NIDL=/usr/bin/nidl
+ NIDLOPTS=-idir /usr/include/idl -m
+ #endif /* !LOCAL_NCS */
+
.SUFFIXES: .idl .h
+
+ #ifdef ultrix
+ COMPILE_ET=/usr/athena/bin/compile_et
+ #else
COMPILE_ET=/usr/athena/compile_et
+ #endif
#if defined(_AUX_SOURCE)
***************
*** 99,110 ****
--- 123,139 ----
ALL= lpqd lpquota qdb_create s_chkaf $(DBPROGRAMS)
+ #ifdef LOCAL_NCS
all: ./ncs/cpp/cpp ./ncs/nidl/nidl ./ncs/nck/libnck.a ${ALL}
+ #else
+ all: ${ALL}
+ #endif /* LOCAL_NCS */
Makefile: Imakefile ../cppflags
-mv -f Makefile Makefile.bak
/lib/cpp `../cppflags` Imakefile Makefile
+ #ifdef LOCAL_NCS
./ncs/cpp/cpp:
(cd ncs/cpp; make MFLAGS=$(MFLAGS) )
***************
*** 113,118 ****
--- 142,148 ----
./ncs/nck/libnck.a:
(cd ncs/nck; make MFLAGS=$(MFLAGS) )
+ #endif /* LOCAL_NCS */
s_chkaf: ${SOBJS}
${CC} -o s_chkaf ${SOBJS} ${LIBS}
***************
*** 179,187 ****
install:
! install -s -c lpquota ${DESTDIR}/usr/athena/lpquota
! install -s -c lpqd ${DESTDIR}/usr/etc/lpqd
! install -s -c s_chkaf ${DESTDIR}/usr/etc/s_chkaf
clean:
rm -f quota_ncs_sstub.c quota_ncs_cswtch.c quota_ncs_cstub.c \
--- 209,217 ----
install:
! install -s -c lpquota ${DESTDIR}/usr/athena/bin/lpquota
! install -s -c lpqd ${DESTDIR}/usr/athena/etc/lpqd
! install -s -c s_chkaf ${DESTDIR}/usr/athena/etc/s_chkaf
clean:
rm -f quota_ncs_sstub.c quota_ncs_cswtch.c quota_ncs_cstub.c \
