From: Jeffrey Hutzelman Date: Mon, 10 Sep 2001 20:15:57 +0000 (+0000) Subject: make-install-support-for-transarc-and-prefix-style-universes-20010907 X-Git-Tag: BP-openafs-stable-1_2_x~12 X-Git-Url: http://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=80e2c2f8cee29c4e89ab0363e276836d1d95d1d9 make-install-support-for-transarc-and-prefix-style-universes-20010907 according to jeff: - Renames the top-level 'install' target to 'build'. This should be transparent, since no one should be using that. - Improves on Sam's dirpath patches, by splitting out server binaries into separate bin, sbin, and libexec directories in GCS mode (these are all /usr/afs/bin in Transarc mode). - Updates the top-level 'all' target so that it builds the software but does not generate a dest tree. Top-level 'lib' and 'include' directories are generated to hold the intermediate libraries and headers used during the build. - Adds a new top-level 'install' target, which installs things in the appropriate directories under ${DESTDIR}, based on configure's install directories plus the extras added by Sam's patch. - Adds a new top-level 'dest' target, which creates an old-style dest directory under ${DEST}. The ${DEST} variable defaults to the traditional value of ${SRCDIR_PARENT}/${SYS_NAME}/dest. Note that this variable used to be called ${DESTDIR}; it was renamed to avoid conflicts with the de facto standard usage of ${DESTDIR}. ==================== This delta was composed from multiple commits as part of the CVS->Git migration. The checkin message with each commit was inconsistent. The following are the additional commit messages. ==================== fix missed makefile ==================== update another missed file ==================== eliminate bogus escaping ==================== get rid of another bogus escape ==================== remove unused include directory ==================== get rid of no longer used libdir ==================== remove unused incdir ==================== fix up some problems for make compatibility and missing trailing / ==================== put afs.exp in the right place ==================== remove bogus afssrvdir reference ==================== update dest version of output ==================== update ref to libexecdir ==================== kill refs to afssrvdir ==================== convert missed LIBDIR to TOP_LIBDIR ==================== remove explicit INSTALL and use makefile.@sys value instead ==================== except it's helpful to actually include makefile.@sys ==================== convert LIBDIR to TOP_LIBDIR --- diff --git a/Makefile.in b/Makefile.in index 66990c8..4f74f1b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -6,10 +6,22 @@ # directory or online at http://www.openafs.org/dl/license10.html SHELL=/bin/sh -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ TOP_SRCDIR=@TOP_SRCDIR@ -INSTALL=${SRCDIR}/bin/install +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afskerneldir=@afskerneldir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ # Systype-generic items SYS_NAME=@AFS_SYSNAME@ @@ -29,6 +41,8 @@ WITH_INSECURE=@WITH_INSECURE@ ENABLE_KERNEL_MODULE=@ENABLE_KERNEL_MODULE@ +include src/config/Makefile.${SYS_NAME} + # To compile AFS from scratch in the src tree run "make". # This recursively calls "make install ..." and does not depend on the # existence of any non-standard programs. @@ -36,25 +50,66 @@ ENABLE_KERNEL_MODULE=@ENABLE_KERNEL_MODULE@ # rxgen, compile_et and others already exist and runs it with # "-argument kinstall". -COMPILE_PART1=cd src; cd -COMPILE_PART2=; $(MAKE) install -COMPILE_PART3=; $(MAKE) test -COMPILE_CLEAN=; $(MAKE) clean +COMPILE_PART1 = cd src; cd +COMPILE_PART2A = ; $(MAKE) +COMPILE_PART2B = all +COMPILE_PART2 = ${COMPILE_PART2A} ${COMPILE_PART2B} +COMPILE_CLEAN = ${COMPILE_PART2A} clean + +all: force ${TOP_INCDIR} ${TOP_INCDIR}/afs ${TOP_LIBDIR} + $(MAKE) build + +all_nolibafs: force ${TOP_INCDIR} ${TOP_INCDIR}/afs ${TOP_LIBDIR} + $(MAKE) build TARGET=finale_nolibafs + +only_libafs: force ${TOP_INCDIR} ${TOP_INCDIR}/afs ${TOP_LIBDIR} + $(MAKE) build TARGET=libafs + +only_libafs_tree: force ${TOP_INCDIR} ${TOP_INCDIR}/afs ${TOP_LIBDIR} + $(MAKE) build TARGET=libafs_tree -all: force ${SYS_NAME}/dest - $(MAKE) install +install: all install_dirs + $(MAKE) build COMPILE_PART2B=install -all_nolibafs: ${SYS_NAME}/dest - $(MAKE) install TARGET=finale_nolibafs +install_nolibafs: all install_dirs + $(MAKE) build TARGET=finale_nolibafs COMPILE_PART2B=install -only_libafs: ${SYS_NAME}/dest - $(MAKE) install TARGET=libafs +install_only_libafs: all install_dirs + $(MAKE) build TARGET=libafs COMPILE_PART2B=install -only_libafs_tree: ${SYS_NAME}/dest - $(MAKE) install TARGET=libafs_tree +dest: all dest_dirs + $(MAKE) build COMPILE_PART2B=dest -${SYS_NAME}/dest: - mkdir -p ${SYS_NAME}/dest +dest_nolibafs: all dest_dirs + $(MAKE) build TARGET=finale_nolibafs COMPILE_PART2B=dest + +dest_only_libafs: all dest_dirs + $(MAKE) build TARGET=libafs COMPILE_PART2B=dest + +${TOP_INCDIR} ${TOP_INCDIR}/afs ${TOP_LIBDIR}: + mkdir -p $@ + +install_dirs: force + mkdir -p ${DESTDIR}${bindir} + mkdir -p ${DESTDIR}${sbindir} + mkdir -p ${DESTDIR}${libexecdir}/openafs + mkdir -p ${DESTDIR}${libdir}/afs + mkdir -p ${DESTDIR}${includedir}/afs + mkdir -p ${DESTDIR}${includedir}/rx + mkdir -p ${DESTDIR}${afskerneldir} + mkdir -p ${DESTDIR}${afssrvbindir} + mkdir -p ${DESTDIR}${afssrvsbindir} + mkdir -p ${DESTDIR}${afssrvlibexecdir} + +dest_dirs: force + mkdir -p ${DEST}/bin + mkdir -p ${DEST}/etc + mkdir -p ${DEST}/lib/afs + mkdir -p ${DEST}/include/afs + mkdir -p ${DEST}/include/rx + mkdir -p ${DEST}/root.client/usr/vice/etc/C + mkdir -p ${DEST}/root.server/etc + mkdir -p ${DEST}/root.server/usr/afs/bin project: cmd comerr @@ -77,10 +132,11 @@ comerr: util ${COMPILE_PART1} comerr ${COMPILE_PART2} cmd: comerr - ${COMPILE_PART1} cmd ${COMPILE_PART2} @case ${SYS_NAME} in \ sgi_6* | sun4x_57 | sun4x_58 | hp_ux11* | sparc64_linux* | alpha_linux* ) \ - ${COMPILE_PART1} cmd ${COMPILE_PART2} install64 ;; \ + ${COMPILE_PART1} cmd ${COMPILE_PART2}64 ;; \ + *) \ + ${COMPILE_PART1} cmd ${COMPILE_PART2} ;; \ esac lwp: project util @@ -103,8 +159,9 @@ rxstat: rx rxincls: rxobj ${COMPILE_PART1} rx ${COMPILE_PART2} -rxtests: rxobj - ${COMPILE_PART1} rx ${COMPILE_PART3} +rxtests: rxdebug +rxdebug: rx + ${COMPILE_PART1} rxdebug ${COMPILE_PART2} fsint: project kfsint @@ -141,8 +198,7 @@ auth: project comerr des lwp rx sys rxkad audit ubik: project auth ${COMPILE_PART1} ubik ${COMPILE_PART2} -ubiktests: ubik sys - ${COMPILE_PART1} ubik ${COMPILE_PART3} +ubiktests: ubik ptserver: project ubik cmd comerr auth audit ${COMPILE_PART1} ptserver ${COMPILE_PART2} @@ -205,12 +261,12 @@ null: project gtx: project null auth # kauth rxkad ? case ${SYS_NAME} in \ rs_aix* | sun4x_5? | sgi_6? | *linux* | ppc_darwin* | *fbsd*) \ - $(RM) -f ${DESTDIR}/lib/afs/libtermlib.a; \ - ln -s libnull.a ${DESTDIR}/lib/afs/libtermlib.a; \ + $(RM) -f ${TOP_LIBDIR}/libtermlib.a; \ + ln -s libnull.a ${TOP_LIBDIR}/libtermlib.a; \ ${COMPILE_PART1} gtx ${COMPILE_PART2};; \ *) \ - $(RM) -f ${DESTDIR}/lib/afs/libtermlib.a; \ - ln -s /usr/lib/libtermlib.a ${DESTDIR}/lib/afs/libtermlib.a; \ + $(RM) -f ${TOP_LIBDIR}/libtermlib.a; \ + ln -s /usr/lib/libtermlib.a ${TOP_LIBDIR}/libtermlib.a; \ ${COMPILE_PART1} gtx ${COMPILE_PART2};; \ esac @@ -406,13 +462,13 @@ libadmin: libafsauthent bozo finale: project cmd comerr afsd allrcmds butc tbutc @ENABLE_KERNEL_MODULE@ libuafs audit kauth log package \ ptserver scout bu_utils ubik uss bozo vfsck volser \ - venus update xstat afsmonitor dauth tests libafsrpc \ + venus update xstat afsmonitor dauth rxdebug libafsrpc \ libafsauthent libadmin ${COMPILE_PART1} finale ${COMPILE_PART2} finale_nolibafs: project cmd comerr afsd allrcmds butc tbutc libuafs audit kauth log package \ ptserver scout bu_utils ubik uss bozo vfsck volser \ - venus update xstat afsmonitor dauth tests libafsrpc \ + venus update xstat afsmonitor dauth rxdebug libafsrpc \ libafsauthent libadmin ${COMPILE_PART1} finale ${COMPILE_PART2} @@ -427,8 +483,8 @@ libuafs_setup: config export force: TARGET=finale -install: force - $(MAKE) $(TARGET) +build: force + $(MAKE) $(TARGET) DEST=$(DEST) COMPILE_PART2B=$(COMPILE_PART2B) DESTDIR=$(DESTDIR) kupdate: updatekdir libafs_setup libuafs_setup @@ -503,6 +559,7 @@ clean2: -${COMPILE_PART1} bucoord ${COMPILE_CLEAN} -${COMPILE_PART1} xstat ${COMPILE_CLEAN} -${COMPILE_PART1} afsmonitor ${COMPILE_CLEAN} + -${COMPILE_PART1} rxdebug ${COMPILE_CLEAN} -${COMPILE_PART1} libafsrpc ${COMPILE_CLEAN} -${COMPILE_PART1} libafsauthent ${COMPILE_CLEAN} -${COMPILE_PART1} libadmin ${COMPILE_CLEAN} @@ -528,6 +585,7 @@ clean2: -${COMPILE_PART1} libuafs ${COMPILE_CLEAN} -(cd src/libafs; /bin/rm -rf afs afsint config rx) -(cd src/libuafs; /bin/rm -rf afs afsint config rx des) + -/bin/rm -rf ${TOP_INCDIR} ${TOP_LIBDIR} -/bin/rm -rf libafs_tree ${SYS_NAME} @@ -617,6 +675,7 @@ distclean: clean src/rx/multi.example/Makefile \ src/rx/simple.example/Makefile \ src/rx/test/Makefile \ + src/rxdebug/Makefile \ src/rxgen/Makefile \ src/rxkad/Makefile \ src/rxkad/test/Makefile \ diff --git a/configure.in b/configure.in index 36585f8..086cb11 100644 --- a/configure.in +++ b/configure.in @@ -379,8 +379,9 @@ fi SRCDIR_PARENT=`pwd` TOP_SRCDIR="${SRCDIR_PARENT}/src" -DESTDIR="${SRCDIR_PARENT}/${AFS_SYSNAME}/dest" -SRCDIR="${SRCDIR_PARENT}/${AFS_SYSNAME}/dest" +TOP_INCDIR="${SRCDIR_PARENT}/include" +TOP_LIBDIR="${SRCDIR_PARENT}/lib" +DEST="${SRCDIR_PARENT}/${AFS_SYSNAME}/dest" dnl checks for header files. AC_HEADER_STDC @@ -399,34 +400,40 @@ dnl Directory PATH handling if test "x$enable_transarc_paths" = "xyes" ; then afsconfdir=${afsconfdir=/usr/afs/etc} viceetcdir=${viceetcdir=/usr/vice/etc} - afssrvdir=${afssrvdir=/usr/afs/bin} + afskerneldir=${afskerneldir=${viceetcdir}} + afssrvbindir=${afssrvbindir=/usr/afs/bin} + afssrvsbindir=${afssrvsbindir=/usr/afs/bin} + afssrvlibexecdir=${afssrvlibexecdir=/usr/afs/bin} afsdbdir=${afsdbdir=/usr/afs/db} afslogsdir=${afslogsdir=/usr/afs/logs} afslocaldir=${afslocaldir=/usr/afs/local} afsbackupdir=${afsbackupdir=/usr/afs/backup} afsbosconfigdir=${afsbosconfigdir=/usr/afs/local} - afsbosserverdir=${afsbosserverdir=/usr/afs/bin} else afsconfdir=${afsconfdir=$sysconfdir/openafs/server} viceetcdir=${viceetcdir=$sysconfdir/openafs} - afssrvdir=${afssrvdir=$libexecdir/openafs} + afskerneldir=${afskerneldir=$libdir/openafs} + afssrvbindir=${afssrvbindir=$bindir} + afssrvsbindir=${afssrvsbindir=$sbindir} + afssrvlibexecdir=${afssrvlibexecdir=$libexecdir/openafs} afsdbdir=${afsdbdir=$localstatedir/openafs/db} afslogsdir=${afslogsdir=$localstatedir/openafs/logs} afslocaldir=${afslocaldir=$localstatedir/openafs} afsbackupdir=${afsbackupdir=$localstatedir/openafs/backup} afsbosconfigdir=${afsbosconfigdir=$sysconfdir/openafs} - afsbosserverdir=${afsbosserverdir=$sbindir} fi AC_SUBST(afsconfdir) AC_SUBST(viceetcdir) -AC_SUBST(afssrvdir) +AC_SUBST(afskerneldir) +AC_SUBST(afssrvbindir) +AC_SUBST(afssrvsbindir) +AC_SUBST(afssrvlibexecdir) AC_SUBST(afsdbdir) AC_SUBST(afslogsdir) AC_SUBST(afslocaldir) AC_SUBST(afsbackupdir) AC_SUBST(afsbosconfigdir) -AC_SUBST(afsbosserverdir) if test "x$enable_kernel_module" = "xyes"; then ENABLE_KERNEL_MODULE=libafs @@ -439,8 +446,9 @@ AC_SUBST(LINUX_KERNEL_PATH) AC_SUBST(LINUX_VERSION) AC_SUBST(MKAFS_OSTYPE) AC_SUBST(TOP_SRCDIR) -AC_SUBST(DESTDIR) -AC_SUBST(SRCDIR) +AC_SUBST(TOP_INCDIR) +AC_SUBST(TOP_LIBDIR) +AC_SUBST(DEST) AC_SUBST(WITH_OBSOLETE) AC_SUBST(WITH_INSECURE) @@ -525,6 +533,7 @@ src/rx/bulktest/Makefile \ src/rx/multi.example/Makefile \ src/rx/simple.example/Makefile \ src/rx/test/Makefile \ +src/rxdebug/Makefile \ src/rxgen/Makefile \ src/rxkad/Makefile \ src/rxkad/test/Makefile \ diff --git a/src/afs/Makefile.in b/src/afs/Makefile.in index 77df5c5..8b46d8e 100644 --- a/src/afs/Makefile.in +++ b/src/afs/Makefile.in @@ -5,8 +5,22 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -16,13 +30,23 @@ UKERNELDIR = ../libuafs/ include ../config/Makefile.${SYS_NAME} -all: install +all: kinstall ukinstall ${TOP_INCDIR}/afs/afs.h ${TOP_INCDIR}/afs/osi_inode.h ${TOP_INCDIR}/afs/afs_stats.h ${TOP_INCDIR}/afs/exporter.h ${TOP_INCDIR}/afs/nfsclient.h + case ${SYS_NAME} in \ + pmax_ul43 | pmax_ul43a) \ + ${INSTALL} longc_procs.h ${TOP_INCDIR}/afs ;; \ + esac + case ${SYS_NAME} in \ + *linux* ) \ + ${INSTALL} ${AFS_OSTYPE}/osi_vfs.h ${TOP_INCDIR}/afs ;;\ + * ) \ + echo No vfs headers to install for ${SYS_NAME};; \ + esac # NOTE: linux case uses --new as well to work around bug in some versions of # gencat. -kinstall: ${KERNELDIR}/afs ${DESTDIR}/root.client/usr/vice/etc/C AFS_component_version_number.c +kinstall: ${KERNELDIR}/afs AFS_component_version_number.c -chmod 666 ${KERNELDIR}afs/* - ${DESTDIR}/bin/compile_et -v 2 afs_trace.et + ${COMPILE_ET} -v 2 afs_trace.et ${INSTALL} *.[csh] ${KERNELDIR}afs ${INSTALL} VNOPS/*.[csh] ${KERNELDIR}afs ${INSTALL} ${AFS_OSTYPE}/*.[csh] ${KERNELDIR}afs @@ -41,12 +65,9 @@ kinstall: ${KERNELDIR}/afs ${DESTDIR}/root.client/usr/vice/etc/C AFS_component_v ${KERNELDIR}/afs: mkdir -p $@ -${DESTDIR}/root.client/usr/vice/etc/C: - mkdir -p $@ - ukinstall: ${UKERNELDIR}/afs AFS_component_version_number.c -chmod 666 ${UKERNELDIR}afs/* - ${DESTDIR}/bin/compile_et -v 2 afs_trace.et + ${COMPILE_ET} -v 2 afs_trace.et ${INSTALL} *.[csh] ${UKERNELDIR}afs ${INSTALL} VNOPS/*.[csh] ${UKERNELDIR}afs ${INSTALL} UKERNEL/*.[csh] ${UKERNELDIR}afs @@ -54,28 +75,91 @@ ukinstall: ${UKERNELDIR}/afs AFS_component_version_number.c ${UKERNELDIR}/afs: mkdir -p $@ -install: kinstall ukinstall - ${INSTALL} afs.h ${DESTDIR}/include/afs - ${INSTALL} ${AFS_OSTYPE}/osi_inode.h ${DESTDIR}/include/afs - ${INSTALL} afs_stats.h exporter.h nfsclient.h ${DESTDIR}/include/afs +install: ${DESTDIR}${includedir}/afs/afs.h ${DESTDIR}${includedir}/afs/osi_inode.h ${DESTDIR}${includedir}/afs/afs_stats.h ${DESTDIR}${includedir}/afs/exporter.h ${DESTDIR}${includedir}/afs/nfsclient.h case ${SYS_NAME} in \ pmax_ul43 | pmax_ul43a) \ - ${INSTALL} longc_procs.h ${DESTDIR}/include/afs ;; \ + ${INSTALL} longc_procs.h ${DESTDIR}${includedir}/afs ;; \ + esac + case ${SYS_NAME} in \ + *linux* ) \ + ${INSTALL} ${AFS_OSTYPE}/osi_vfs.h ${DESTDIR}${includedir}/afs ;;\ + * ) \ + echo No vfs headers to install for ${SYS_NAME};; \ + esac + +clean: + -$(RM) -f *.o core AFS_component_version_number.c afs_trace.h afs_trace.msf afszcm.cat + +include ../config/Makefile.version +${DEST}/include/afs/afs.h: afs.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/afs.h: afs.h + ${INSTALL} $? $@ + + +${TOP_INCDIR}/afs/afs.h: afs.h + ${INSTALL} $? $@ + + +${DEST}/include/afs/osi_inode.h: ${AFS_OSTYPE}/osi_inode.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/osi_inode.h: ${AFS_OSTYPE}/osi_inode.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/osi_inode.h: ${AFS_OSTYPE}/osi_inode.h + ${INSTALL} $? $@ + + +${DEST}/include/afs/afs_stats.h: afs_stats.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/afs_stats.h: afs_stats.h + ${INSTALL} $? $@ + + +${TOP_INCDIR}/afs/afs_stats.h: afs_stats.h + ${INSTALL} $? $@ + + +${DEST}/include/afs/exporter.h: exporter.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/exporter.h: exporter.h + ${INSTALL} $? $@ + + +${TOP_INCDIR}/afs/exporter.h: exporter.h + ${INSTALL} $? $@ + + +${DEST}/include/afs/nfsclient.h: nfsclient.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/nfsclient.h: nfsclient.h + ${INSTALL} $? $@ + + +${TOP_INCDIR}/afs/nfsclient.h: nfsclient.h + ${INSTALL} $? $@ + + +dest: ${DEST}/include/afs/afs.h ${DEST}/include/afs/osi_inode.h ${DEST}/include/afs/afs_stats.h ${DEST}/include/afs/exporter.h ${DEST}/include/afs/nfsclient.h + case ${SYS_NAME} in \ + pmax_ul43 | pmax_ul43a) \ + ${INSTALL} longc_procs.h ${DEST}/include/afs ;; \ esac case ${SYS_NAME} in \ next_mach30 | vax_ul43 | ppc_darwin* | i386_fbsd* ) \ echo skipping afszcm.cat install for ${SYS_NAME} ;; \ * ) \ - ${INSTALL} afszcm.cat ${DESTDIR}/root.client/usr/vice/etc/C ;; \ + ${INSTALL} afszcm.cat ${DEST}/root.client/usr/vice/etc/C ;; \ esac case ${SYS_NAME} in \ *linux* ) \ - ${INSTALL} ${AFS_OSTYPE}/osi_vfs.h ${DESTDIR}/include/afs ;;\ + ${INSTALL} ${AFS_OSTYPE}/osi_vfs.h ${DEST}/include/afs ;;\ * ) \ echo No vfs headers to install for ${SYS_NAME};; \ esac -clean: - -$(RM) -f *.o core AFS_component_version_number.c afs_trace.h afs_trace.msf afszcm.cat - -include ../config/Makefile.version diff --git a/src/afsd/Makefile.in b/src/afsd/Makefile.in index 1dd420d..51c31c7 100644 --- a/src/afsd/Makefile.in +++ b/src/afsd/Makefile.in @@ -1,3 +1,4 @@ +##XLATE_MANUAL## # Copyright 2000, International Business Machines Corporation and others. # All Rights Reserved. # @@ -6,8 +7,22 @@ # directory or online at http://www.openafs.org/dl/license10.html # afsd makefile -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -15,7 +30,7 @@ SHELL = /bin/sh include ../config/Makefile.${SYS_NAME} -CFLAGS = -g -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS} +CFLAGS=-g -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} LDFLAGS = -g ${XLDFLAGS} INSTALLex = ${INSTALL} -m 755 @@ -29,7 +44,7 @@ all: afsd vsys # Programs # -AFSLIBS=${SRCDIR}/lib/afs/libauth.a ${SRCDIR}/lib/afs/libcmd.a ${SRCDIR}/lib/afs/libsys.a ${SRCDIR}/lib/afs/util.a ${SRCDIR}/lib/librx.a ${SRCDIR}/lib/liblwp.a ${SRCDIR}/lib/afs/util.a +AFSLIBS=${TOP_LIBDIR}/libauth.a ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/util.a ${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/util.a afsd: afsd.o $(AFSLIBS) case ${SYS_NAME} in \ @@ -42,7 +57,7 @@ afsd: afsd.o $(AFSLIBS) esac vsys: vsys.o - $(CC) -g -o vsys vsys.o ${SRCDIR}/lib/afs/libsys.a $(LDFLAGS) ${XLIBS} + $(CC) -g -o vsys vsys.o ${TOP_LIBDIR}/libsys.a $(LDFLAGS) ${XLIBS} # # Objects @@ -56,54 +71,67 @@ clean: system: install -install: all - ${INSTALL} vsys ${DESTDIR}/etc - ${INSTALL} afsd ${DESTDIR}/root.client/usr/vice/etc +# XXX-INST: where to put the rc scripts? +install: ${DESTDIR}${sbindir}/afsd ${DESTDIR}${sbindir}/vsys + +${DESTDIR}${sbindir}/afsd: afsd + ${INSTALL} $? $@ + +${DESTDIR}${sbindir}/vsys: vsys + ${INSTALL} $? $@ + + +dest: ${DEST}/root.client/usr/vice/etc/afsd ${DEST}/etc/vsys case ${SYS_NAME} in \ rs_aix*) \ - ${INSTALL} -f rc.afs.rs_aix ${DESTDIR}/root.client/usr/vice/etc/dkload/rc.afs ; \ - ${INSTALL} -f rc.dkload.client.rs_aix ${DESTDIR}/root.client/usr/vice/etc/dkload/rc.dkload.client ; \ - ${INSTALL} -f rc.dkload.server.rs_aix ${DESTDIR}/root.client/usr/vice/etc/dkload/rc.dkload.server ;; \ + ${INSTALL} -f rc.afs.rs_aix ${DEST}/root.client/usr/vice/etc/dkload/rc.afs ; \ + ${INSTALL} -f rc.dkload.client.rs_aix ${DEST}/root.client/usr/vice/etc/dkload/rc.dkload.client ; \ + ${INSTALL} -f rc.dkload.server.rs_aix ${DEST}/root.client/usr/vice/etc/dkload/rc.dkload.server ;; \ sgi_65 ) \ - ${INSTALL} -f afs.rc.sgi_ipnos ${DESTDIR}/root.client/usr/vice/etc/sgiload/afs.rc ;\ - ${INSTALL} -f afs.rc.sgi_ipnos ${DESTDIR}/root.server/etc/init.d/afs.rc ;;\ + ${INSTALL} -f afs.rc.sgi_ipnos ${DEST}/root.client/usr/vice/etc/sgiload/afs.rc ;\ + ${INSTALL} -f afs.rc.sgi_ipnos ${DEST}/root.server/etc/init.d/afs.rc ;;\ sgi_* ) \ - ${INSTALL} -f afs.rc.sgi ${DESTDIR}/root.client/usr/vice/etc/sgiload/afs.rc ;\ - ${INSTALL} -f afs.rc.sgi ${DESTDIR}/root.server/etc/init.d/afs.rc ;\ + ${INSTALL} -f afs.rc.sgi ${DEST}/root.client/usr/vice/etc/sgiload/afs.rc ;\ + ${INSTALL} -f afs.rc.sgi ${DEST}/root.server/etc/init.d/afs.rc ;\ case ${SYS_NAME} in \ sgi_53 | sgi_61 ) \ - ${INSTALL} -f afs_rtsymtab.pl.${SYS_NAME} ${DESTDIR}/root.client/usr/vice/etc/sgiload/afs_rtsymtab.pl ;;\ + ${INSTALL} -f afs_rtsymtab.pl.${SYS_NAME} ${DEST}/root.client/usr/vice/etc/sgiload/afs_rtsymtab.pl ;;\ esac;; \ sun4_52 | sun4_53 | sun4c_52 | sun4c_53 | sun4m_52 | sun4m_53 | sun4m_54 | sun4_54 | sun4c_54 | sunx86_54) \ - ${INSTALL} -f afs.rc.solaris ${DESTDIR}/root.client/usr/vice/etc/modload/afs.rc ;;\ + ${INSTALL} -f afs.rc.solaris ${DEST}/root.client/usr/vice/etc/modload/afs.rc ;;\ sun4x_57 ) \ - ${INSTALL} -f afs.rc.solaris.2.7 ${DESTDIR}/root.client/usr/vice/etc/modload/afs.rc ;;\ + ${INSTALL} -f afs.rc.solaris.2.7 ${DEST}/root.client/usr/vice/etc/modload/afs.rc ;;\ sun4x_58 ) \ - ${INSTALL} -f afs.rc.solaris.2.8 ${DESTDIR}/root.client/usr/vice/etc/modload/afs.rc ;;\ + ${INSTALL} -f afs.rc.solaris.2.8 ${DEST}/root.client/usr/vice/etc/modload/afs.rc ;;\ sun4x_5? ) \ - ${INSTALL} -f afs.rc.solaris.2_5 ${DESTDIR}/root.client/usr/vice/etc/modload/afs.rc ;;\ + ${INSTALL} -f afs.rc.solaris.2_5 ${DEST}/root.client/usr/vice/etc/modload/afs.rc ;;\ alpha_osf* ) \ - ${INSTALL} -f afs.rc.alpha ${DESTDIR}/root.client/usr/vice/etc/dkload/afs.rc ;;\ + ${INSTALL} -f afs.rc.alpha ${DEST}/root.client/usr/vice/etc/dkload/afs.rc ;;\ hp_ux10? | hp_ux11? ) \ - ${INSTALL} -f afs.rc.hpux10 ${DESTDIR}/root.client/usr/vice/etc/dkload/afs.rc ;\ - ${INSTALL} -f afs.hpux102.driver ${DESTDIR}/root.client/usr/vice/etc/afs.driver ;;\ + ${INSTALL} -f afs.rc.hpux10 ${DEST}/root.client/usr/vice/etc/dkload/afs.rc ;\ + ${INSTALL} -f afs.hpux102.driver ${DEST}/root.client/usr/vice/etc/afs.driver ;;\ alpha_dux* ) \ - ${INSTALL} -f afs.rc.alpha_dux40 ${DESTDIR}/root.client/usr/vice/etc/dkload/afs.rc ;;\ + ${INSTALL} -f afs.rc.alpha_dux40 ${DEST}/root.client/usr/vice/etc/dkload/afs.rc ;;\ hp?00_ux10? ) \ - ${INSTALL} -f afs.rc.hpux10 ${DESTDIR}/root.client/usr/vice/etc/dkload/afs.rc ;;\ + ${INSTALL} -f afs.rc.hpux10 ${DEST}/root.client/usr/vice/etc/dkload/afs.rc ;;\ *linux* ) \ - ${INSTALLex} -f afs.rc.linux ${DESTDIR}/root.client/usr/vice/etc/afs.rc; \ - ${INSTALL} -f afs.conf.linux ${DESTDIR}/root.client/usr/vice/etc/afs.conf ;; \ + ${INSTALLex} -f afs.rc.linux ${DEST}/root.client/usr/vice/etc/afs.rc; \ + ${INSTALL} -f afs.conf.linux ${DEST}/root.client/usr/vice/etc/afs.conf ;; \ ppc_darwin*) \ - mkdir -p ${DESTDIR}/root.client/usr/vice/etc/afs.kext/Contents/MacOS ;\ - ${INSTALL} -f afs.ppc_darwin.plist ${DESTDIR}/root.client/usr/vice/etc/afs.kext/Contents/Info.plist ; \ - ${INSTALLex} -f afs.rc.darwin ${DESTDIR}/root.client/usr/vice/etc/afs.rc ; \ - ${INSTALL} -f afs.rc.darwin.plist ${DESTDIR}/root.client/usr/vice/etc/StartupParameters.plist ;; \ + mkdir -p ${DEST}/root.client/usr/vice/etc/afs.kext/Contents/MacOS ;\ + ${INSTALL} -f afs.ppc_darwin.plist ${DEST}/root.client/usr/vice/etc/afs.kext/Contents/Info.plist ; \ + ${INSTALLex} -f afs.rc.darwin ${DEST}/root.client/usr/vice/etc/afs.rc ; \ + ${INSTALL} -f afs.rc.darwin.plist ${DEST}/root.client/usr/vice/etc/StartupParameters.plist ;; \ *fbsd*) \ - mkdir -p ${DESTDIR}/root.client/usr/vice/etc/afs.rc; \ - ${INSTALL} -f afs.rc.fbsd ${DESTDIR}/root.client/usr/vice/etc/afs.rc.fbsd ;; \ + ${INSTALL} -f afs.rc.fbsd ${DEST}/root.client/usr/vice/etc/afs.rc.fbsd ;; \ * ) \ echo No rc scripts installed for ${SYS_NAME} ;; \ esac +${DEST}/root.client/usr/vice/etc/afsd: afsd + ${INSTALL} $? $@ + +${DEST}/etc/vsys: vsys + ${INSTALL} $? $@ + include ../config/Makefile.version diff --git a/src/afsmonitor/Makefile.in b/src/afsmonitor/Makefile.in index 0e258a7..213ed29 100644 --- a/src/afsmonitor/Makefile.in +++ b/src/afsmonitor/Makefile.in @@ -6,8 +6,22 @@ # directory or online at http://www.openafs.org/dl/license10.html # Makefile for Afsmonitor, the AFS Performance monitoring tool -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -17,41 +31,40 @@ include ../config/Makefile.${SYS_NAME} CFLAGS=-g -I. \ -I${TOP_SRCDIR}/config \ - -I${SRCDIR}/include \ - -I${SRCDIR}/include/afs \ - -I${SRCDIR} ${XCFLAGS} + -I${TOP_INCDIR} \ + -I${TOP_INCDIR}/afs \ + ${XCFLAGS} LDFLAGS = ${XLDFLAGS} -INCLS=${SRCDIR}/include/afs/gtxobjects.h \ - ${SRCDIR}/include/afs/gtxwindows.h \ - ${SRCDIR}/include/afs/gtxcurseswin.h \ - ${SRCDIR}/include/afs/gtxdumbwin.h \ - ${SRCDIR}/include/afs/gtxX11win.h \ - ${SRCDIR}/include/afs/gtxobjects.h \ - ${SRCDIR}/include/afs/gtxlightobj.h \ - ${SRCDIR}/include/afs/gtxtextobj.h \ - ${SRCDIR}/include/afs/gtxobjdict.h \ - ${SRCDIR}/include/afs/keys.h \ - ${SRCDIR}/include/afs/cellconfig.h \ - ${SRCDIR}/include/afs/cmd.h \ - ${SRCDIR}/include/afs/xstat_fs.h \ - ${SRCDIR}/include/afs/xstat_cm.h \ +INCLS=${TOP_INCDIR}/afs/gtxobjects.h \ + ${TOP_INCDIR}/afs/gtxwindows.h \ + ${TOP_INCDIR}/afs/gtxcurseswin.h \ + ${TOP_INCDIR}/afs/gtxdumbwin.h \ + ${TOP_INCDIR}/afs/gtxX11win.h \ + ${TOP_INCDIR}/afs/gtxobjects.h \ + ${TOP_INCDIR}/afs/gtxlightobj.h \ + ${TOP_INCDIR}/afs/gtxtextobj.h \ + ${TOP_INCDIR}/afs/gtxobjdict.h \ + ${TOP_INCDIR}/afs/keys.h \ + ${TOP_INCDIR}/afs/cellconfig.h \ + ${TOP_INCDIR}/afs/cmd.h \ + ${TOP_INCDIR}/afs/xstat_fs.h \ + ${TOP_INCDIR}/afs/xstat_cm.h \ afsmonitor.h \ afsmon-labels.h -LIBS=${SRCDIR}/lib/afs/libxstat_fs.a \ - ${SRCDIR}/lib/afs/libxstat_cm.a \ - ${SRCDIR}/lib/afs/libgtx.a \ - ${SRCDIR}/lib/afs/libafsint.a \ - ${SRCDIR}/lib/afs/libcmd.a \ - ${SRCDIR}/lib/librx.a \ - ${SRCDIR}/lib/liblwp.a \ - ${SRCDIR}/lib/afs/libsys.a \ - ${SRCDIR}/lib/afs/util.a +LIBS=${TOP_LIBDIR}/libxstat_fs.a \ + ${TOP_LIBDIR}/libxstat_cm.a \ + ${TOP_LIBDIR}/libgtx.a \ + ${TOP_LIBDIR}/libafsint.a \ + ${TOP_LIBDIR}/libcmd.a \ + ${TOP_LIBDIR}/librx.a \ + ${TOP_LIBDIR}/liblwp.a \ + ${TOP_LIBDIR}/libsys.a \ + ${TOP_LIBDIR}/util.a -EXTRA_LIBS= ${TXLIBS} ${SRCDIR}/lib/afs/libtermlib.a ${XLIBS} +EXTRA_LIBS=${TXLIBS} ${TOP_LIBDIR}/libtermlib.a ${XLIBS} -all: afsmonitor -system: install +all: afsmonitor afsmon-output.o: afsmon-output.c ${INCLS} afsmon-win.o: afsmon-win.c ${INCLS} @@ -68,10 +81,18 @@ afsmon-parselog: afsmon-parselog.o ${LIBS} # # Misc others # -install: all - ${INSTALL} afsmonitor ${DESTDIR}/bin +install: ${DESTDIR}${bindir}/afsmonitor clean: $(RM) -f *.o afsmonitor AFS_component_version_number.c include ../config/Makefile.version +${DEST}/bin/afsmonitor: afsmonitor + ${INSTALL} $? $@ + +${DESTDIR}${bindir}/afsmonitor: afsmonitor + ${INSTALL} $? $@ + + +dest: ${DEST}/bin/afsmonitor + diff --git a/src/afsweb/Makefile.in b/src/afsweb/Makefile.in index d9e112a..494806c 100644 --- a/src/afsweb/Makefile.in +++ b/src/afsweb/Makefile.in @@ -5,8 +5,21 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -16,7 +29,7 @@ SHELL=/bin/sh include ../config/Makefile.${SYS_NAME} UKERNELDIR=../libuafs/ -COMPILE_ET=${SRCDIR}/bin/compile_et +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et UKSRCS=nsafs.h nsafs.c securehash.c @@ -45,81 +58,81 @@ system apache_afs_web_secure: echo Clean, make, and install the lib for 1.2 ; \ $(MAKE) libclean ; \ $(MAKE) AUX_CFLAGS=-DAIX $(APACHE_AFS_LIB) ; \ - ${INSTALL} ${APACHE_AFS_LIB} ${DESTDIR}/root.afsweb/lib/apache_1.2 ; \ + ${INSTALL} ${APACHE_AFS_LIB} ${DEST}/root.afsweb/lib/apache_1.2 ; \ echo Make and install source for 1.2 ; \ /bin/rm -f $(SRC_MODULE) ; \ $(MAKE) $(SRC_MODULE) VERSION_CFLAG=-DAPACHE_1_2 ; \ - ${INSTALL} $(SRC_MODULE) ${DESTDIR}/root.afsweb/src/apache_1.2 ; \ + ${INSTALL} $(SRC_MODULE) ${DEST}/root.afsweb/src/apache_1.2 ; \ echo Make and install the lib for 1.3.1 ; \ $(MAKE) libclean ; \ $(MAKE) AUX_CFLAGS=-DAIX $(APACHE_AFS_LIB) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_1" ; \ - ${INSTALL} $(APACHE_AFS_LIB) ${DESTDIR}/root.afsweb/lib/apache_1.3.1 ; \ + ${INSTALL} $(APACHE_AFS_LIB) ${DEST}/root.afsweb/lib/apache_1.3.1 ; \ echo Make and install source for 1.3.1 ; \ /bin/rm -f $(SRC_MODULE) ; \ $(MAKE) $(SRC_MODULE) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_1" ; \ - ${INSTALL} $(SRC_MODULE) ${DESTDIR}/root.afsweb/src/apache_1.3.1 ; \ + ${INSTALL} $(SRC_MODULE) ${DEST}/root.afsweb/src/apache_1.3.1 ; \ echo Clean, make, and install the lib for 1.3.6 ; \ $(MAKE) libclean ; \ $(MAKE) AUX_CFLAGS=-DAIX $(APACHE_AFS_LIB) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_6"; \ - ${INSTALL} $(APACHE_AFS_LIB) ${DESTDIR}/root.afsweb/lib/apache_1.3.6 ; \ + ${INSTALL} $(APACHE_AFS_LIB) ${DEST}/root.afsweb/lib/apache_1.3.6 ; \ /bin/rm -f $(SRC_MODULE) ; \ echo Make and install source for 1.3.1 ; \ $(MAKE) $(SRC_MODULE) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_6" ; \ - ${INSTALL} $(SRC_MODULE) ${DESTDIR}/root.afsweb/src/apache_1.3.6 ; \ + ${INSTALL} $(SRC_MODULE) ${DEST}/root.afsweb/src/apache_1.3.6 ; \ echo Do the binaries ; \ $(MAKE) AUX_CFLAGS=-DAIX $(BINARIES) ;; \ sun*) \ $(MAKE) libclean ; \ $(MAKE) AUX_FLAGS=-DSOLARIS $(APACHE_AFS_LIB) ; \ - ${INSTALL} $(APACHE_AFS_LIB) ${DESTDIR}/root.afsweb/lib/apache_1.2 ; \ + ${INSTALL} $(APACHE_AFS_LIB) ${DEST}/root.afsweb/lib/apache_1.2 ; \ $(MAKE) libclean ; \ $(MAKE) AUX_FLAGS=-DSOLARIS $(APACHE_AFS_LIB) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_1" ; \ - ${INSTALL} $(APACHE_AFS_LIB) ${DESTDIR}/root.afsweb/lib/apache_1.3.1 ; \ + ${INSTALL} $(APACHE_AFS_LIB) ${DEST}/root.afsweb/lib/apache_1.3.1 ; \ $(MAKE) libclean ; \ $(MAKE) AUX_FLAGS=-DSOLARIS $(APACHE_AFS_LIB) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_6" ; \ - ${INSTALL} $(APACHE_AFS_LIB) ${DESTDIR}/root.afsweb/lib/apache_1.3.6 ; \ + ${INSTALL} $(APACHE_AFS_LIB) ${DEST}/root.afsweb/lib/apache_1.3.6 ; \ /bin/rm -f $(SRC_MODULE) ; \ $(MAKE) $(SRC_MODULE) VERSION_CFLAG=-DAPACHE_1_2 ; \ - ${INSTALL} $(SRC_MODULE) ${DESTDIR}/root.afsweb/src/apache_1.2 ; \ + ${INSTALL} $(SRC_MODULE) ${DEST}/root.afsweb/src/apache_1.2 ; \ /bin/rm -f $(SRC_MODULE) ; \ $(MAKE) $(SRC_MODULE) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_1" ; \ - ${INSTALL} $(SRC_MODULE) ${DESTDIR}/root.afsweb/src/apache_1.3.1 ; \ + ${INSTALL} $(SRC_MODULE) ${DEST}/root.afsweb/src/apache_1.3.1 ; \ /bin/rm -f $(SRC_MODULE) ; \ $(MAKE) $(SRC_MODULE) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_6" ; \ - ${INSTALL} $(SRC_MODULE) ${DESTDIR}/root.afsweb/src/apache_1.3.6 ; \ + ${INSTALL} $(SRC_MODULE) ${DEST}/root.afsweb/src/apache_1.3.6 ; \ $(MAKE) AUX_CFLAGS=-DSOLARIS "XLIBS=-lsocket -lnsl" $(BINARIES) ;; \ *linux*) \ $(MAKE) libclean ; \ $(MAKE) AUX_FLAGS=-DLINUX $(APACHE_AFS_LIB) ; \ - ${INSTALL} $(APACHE_AFS_LIB) ${DESTDIR}/root.afsweb/lib/apache_1.2 ; \ + ${INSTALL} $(APACHE_AFS_LIB) ${DEST}/root.afsweb/lib/apache_1.2 ; \ $(MAKE) libclean ; \ $(MAKE) AUX_FLAGS=-DLINUX $(APACHE_AFS_LIB) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_1" ; \ - ${INSTALL} $(APACHE_AFS_LIB) ${DESTDIR}/root.afsweb/lib/apache_1.3.1 ; \ + ${INSTALL} $(APACHE_AFS_LIB) ${DEST}/root.afsweb/lib/apache_1.3.1 ; \ $(MAKE) libclean ; \ $(MAKE) AUX_FLAGS=-DLINUX $(APACHE_AFS_LIB) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_6" ; \ - ${INSTALL} $(APACHE_AFS_LIB) ${DESTDIR}/root.afsweb/lib/apache_1.3.6 ; \ + ${INSTALL} $(APACHE_AFS_LIB) ${DEST}/root.afsweb/lib/apache_1.3.6 ; \ /bin/rm -f $(SRC_MODULE) ; \ $(MAKE) $(SRC_MODULE) VERSION_CFLAG=-DAPACHE_1_2 ; \ - ${INSTALL} $(SRC_MODULE) ${DESTDIR}/root.afsweb/src/apache_1.2 ; \ + ${INSTALL} $(SRC_MODULE) ${DEST}/root.afsweb/src/apache_1.2 ; \ /bin/rm -f $(SRC_MODULE) ; \ $(MAKE) $(SRC_MODULE) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_1" ; \ - ${INSTALL} $(SRC_MODULE) ${DESTDIR}/root.afsweb/src/apache_1.3.1 ; \ + ${INSTALL} $(SRC_MODULE) ${DEST}/root.afsweb/src/apache_1.3.1 ; \ /bin/rm -f $(SRC_MODULE) ; \ $(MAKE) $(SRC_MODULE) VERSION_CFLAG="-DAPACHE_1_3 -DAPACHE_1_3_6" ; \ - ${INSTALL} $(SRC_MODULE) ${DESTDIR}/root.afsweb/src/apache_1.3.6 ; \ + ${INSTALL} $(SRC_MODULE) ${DEST}/root.afsweb/src/apache_1.3.6 ; \ $(MAKE) AUX_CFLAGS=-DLINUX "XLIBS=-lnsl" $(BINARIES) ;; \ * ) \ echo "NOT BUILT FOR ${SYS_NAME}"; ;; \ esac - ${INSTALL} ${APACHEAFS_DOC} ${DESTDIR}/root.afsweb/doc - ${INSTALL} ${APACHE_INSTALL_SCRIPT} ${DESTDIR}/root.afsweb/install - chmod a+x ${DESTDIR}/root.afsweb/install/${APACHE_INSTALL_SCRIPT} - chmod a+w ${DESTDIR}/root.afsweb/install/${APACHE_INSTALL_SCRIPT} - ${INSTALL} $(BINARIES) ${DESTDIR}/root.afsweb/bin + ${INSTALL} ${APACHEAFS_DOC} ${DEST}/root.afsweb/doc + ${INSTALL} ${APACHE_INSTALL_SCRIPT} ${DEST}/root.afsweb/install + chmod a+x ${DEST}/root.afsweb/install/${APACHE_INSTALL_SCRIPT} + chmod a+w ${DEST}/root.afsweb/install/${APACHE_INSTALL_SCRIPT} + ${INSTALL} $(BINARIES) ${DEST}/root.afsweb/bin -all: +all: kinstall ukinstall -install: kinstall ukinstall +install: kinstall: @echo No $@ source here. @@ -151,29 +164,29 @@ OPTF= DEBUG_FLAG= AUX_CFLAGS= VERSION_CFLAG= -AFS_INCL=-I${SRCDIR}/include -I.. -I../config +AFS_INCL=-I${TOP_INCDIR} -I.. -I../config CFLAGS=$(OPTF) $(DEFINES) -I. -I.. $(EXTRA_CFLAGS) $(VERSION_CFLAG) $(DEBUG_FLAG) -INCLS=${SRCDIR}/include/ubik.h \ - ${SRCDIR}/include/lwp.h \ - ${SRCDIR}/include/lock.h \ - ${SRCDIR}/include/rx/rx.h \ - ${SRCDIR}/include/rx/xdr.h \ - ${SRCDIR}/include/rx/rxkad.h \ - ${SRCDIR}/include/afs/com_err.h \ +INCLS=${TOP_INCDIR}/ubik.h \ + ${TOP_INCDIR}/lwp.h \ + ${TOP_INCDIR}/lock.h \ + ${TOP_INCDIR}/rx/rx.h \ + ${TOP_INCDIR}/rx/xdr.h \ + ${TOP_INCDIR}/rx/rxkad.h \ + ${TOP_INCDIR}/afs/com_err.h \ weblog_errors.h $(DCE_DLOG_INCLUDES) -deslib=${SRCDIR}/lib/libdes.a -rxkadlib=${SRCDIR}/lib/librxkad.a -authlib=${SRCDIR}/lib/afs/libauth.a -cmdlib=${SRCDIR}/lib/afs/libcmd.a -utilib=${SRCDIR}/lib/afs/util.a -auditlib=${SRCDIR}/lib/afs/libaudit.a -kauthlib=${SRCDIR}/lib/afs/libkauth.a - -LIBS = ${kauthlib} ${SRCDIR}/lib/libubik.a ${SRCDIR}/lib/afs/libprot.a \ - ${authlib} ${rxkadlib} ${SRCDIR}/lib/afs/libsys.a ${SRCDIR}/lib/librx.a \ - ${SRCDIR}/lib/afs/libsys.a \ - ${SRCDIR}/lib/liblwp.a ${deslib} ${cmdlib} \ - ${SRCDIR}/lib/afs/libcom_err.a ${utilib} \ +deslib=${TOP_LIBDIR}/libdes.a +rxkadlib=${TOP_LIBDIR}/librxkad.a +authlib=${TOP_LIBDIR}/libauth.a +cmdlib=${TOP_LIBDIR}/libcmd.a +utilib=${TOP_LIBDIR}/util.a +auditlib=${TOP_LIBDIR}/libaudit.a +kauthlib=${TOP_LIBDIR}/libkauth.a + +LIBS=${kauthlib} ${TOP_LIBDIR}/libubik.a ${TOP_LIBDIR}/libprot.a \ + ${authlib} ${rxkadlib} ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/librx.a \ + ${TOP_LIBDIR}/libsys.a \ + ${TOP_LIBDIR}/liblwp.a ${deslib} ${cmdlib} \ + ${TOP_LIBDIR}/libcom_err.a ${utilib} \ $(DBM) $(XLIBS) AR=ar @@ -239,3 +252,5 @@ libclean: include ../config/Makefile.version +dest: + diff --git a/src/audit/Makefile.in b/src/audit/Makefile.in index db687d5..aeebffc 100644 --- a/src/audit/Makefile.in +++ b/src/audit/Makefile.in @@ -12,8 +12,22 @@ # # supported (if not supported, don't show it). # ###################################################################### -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -23,19 +37,12 @@ include ../config/Makefile.${SYS_NAME} UKERNELDIR = ../libuafs/ -CFLAGS = ${OPTMZ} -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS} +CFLAGS=${OPTMZ} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} -all: install +all: ukinstall ${TOP_LIBDIR}/libaudit.a ${TOP_INCDIR}/afs/audit.h -install: ukinstall ${DESTDIR}/lib/afs/libaudit.a ${DESTDIR}/include/afs/audit.h - case ${SYS_NAME} in \ - rs_aix*) \ - ${INSTALL} Audit ${DESTDIR}/root.server/usr/afs/local ; \ - ${INSTALL} objects.aix.sample ${DESTDIR}/root.server/usr/afs/local/audit/objects.sample ; \ - ${INSTALL} events.aix.sample ${DESTDIR}/root.server/usr/afs/local/audit/events.sample ; \ - ${INSTALL} config.aix.sample ${DESTDIR}/root.server/usr/afs/local/audit/config.sample ;; \ - *) ;; \ - esac ; +# XXX-INST: where to install the AIX audit files? +install: ${DESTDIR}${libdir}/afs/libaudit.a ${DESTDIR}${includedir}/afs/audit.h ukinstall: ${UKERNELDIR}/afs ${UKERNELDIR}/afs/audit.h @@ -45,10 +52,10 @@ ${UKERNELDIR}/afs: ${UKERNELDIR}/afs/audit.h: audit.h ${INSTALL} $? $@ -${DESTDIR}/include/afs/audit.h: audit.h +${DEST}/include/afs/audit.h: audit.h ${INSTALL} $? $@ -${DESTDIR}/lib/afs/libaudit.a: libaudit.a +${DEST}/lib/afs/libaudit.a: libaudit.a ${INSTALL} $? $@ libaudit.a: audit.o AFS_component_version_number.o @@ -63,3 +70,25 @@ clean: $(RM) -f *.a *.o core AFS_component_version_number.c include ../config/Makefile.version +${DESTDIR}${libdir}/afs/libaudit.a: libaudit.a + ${INSTALL} $? $@ + +${TOP_LIBDIR}/libaudit.a: libaudit.a + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/audit.h: audit.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/audit.h: audit.h + ${INSTALL} $? $@ + +dest: ${DEST}/lib/afs/libaudit.a ${DEST}/include/afs/audit.h + case ${SYS_NAME} in \ + rs_aix*) \ + ${INSTALL} Audit ${DEST}/root.server/usr/afs/local ; \ + ${INSTALL} objects.aix.sample ${DEST}/root.server/usr/afs/local/audit/objects.sample ; \ + ${INSTALL} events.aix.sample ${DEST}/root.server/usr/afs/local/audit/events.sample ; \ + ${INSTALL} config.aix.sample ${DEST}/root.server/usr/afs/local/audit/config.sample ;; \ + *) ;; \ + esac ; + diff --git a/src/auth/Makefile.in b/src/auth/Makefile.in index 16cc39a..bcef968 100644 --- a/src/auth/Makefile.in +++ b/src/auth/Makefile.in @@ -5,8 +5,21 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -16,26 +29,26 @@ include ../config/Makefile.${SYS_NAME} KERNELDIR = ../libafs/ UKERNELDIR = ../libuafs/ -COMPILE_ET = ${SRCDIR}/bin/compile_et +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et OBJS= cellconfig.o ktc.o userok.o writeconfig.o authcon.o \ acfg_errors.o ktc_errors.o KOBJS= cellconfig.o ktc.krb.o userok.o writeconfig.o authcon.o \ acfg_errors.o ktc_errors.o -CFLAGS=-g -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS} -LIBS= libauth.a ${DESTDIR}/lib/afs/libsys.a \ - ${DESTDIR}/lib/librxkad.a ${DESTDIR}/lib/libdes.a \ - ${DESTDIR}/lib/librx.a ${DESTDIR}/lib/afs/libsys.a \ - ${DESTDIR}/lib/liblwp.a ${SRCDIR}/lib/afs/util.a ${XLIBS} +CFLAGS=-g -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} +LIBS=libauth.a ${TOP_LIBDIR}/libsys.a \ + ${TOP_LIBDIR}/librxkad.a ${TOP_LIBDIR}/libdes.a \ + ${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/libsys.a \ + ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/util.a ${XLIBS} INCLS=cellconfig.h auth.h keys.h KSRCS=auth.h UKSRCS=${KSRCS} cellconfig.h acfg_errors.c keys.h cellconfig.c \ ktc.c authcon.c ktc_errors.c -all: install +all: kinstall ukinstall ${TOP_LIBDIR}/libauth.a ${TOP_LIBDIR}/libauth.krb.a ${TOP_INCDIR}/afs/keys.h ${TOP_INCDIR}/afs/cellconfig.h ${TOP_INCDIR}/afs/auth.h copyauth setkey cellconfig.o: cellconfig.c ${INCLS} -ktc.o: ktc.c ${INCLS} ${SRCDIR}/include/afs/vice.h +ktc.o: ktc.c ${INCLS} ${TOP_INCDIR}/afs/vice.h writeconfig.o: writeconfig.c ${INCLS} authcon.o: authcon.c ${INCLS} userok.o: userok.c ${INCLS} @@ -43,7 +56,7 @@ cellconfig.o: cellconfig.c ${INCLS} copyauth.o: copyauth.c ${INCLS} AFS_component_version_number.o setkey.o: setkey.c ${INCLS} AFS_component_version_number.o -ktc.krb.o: ktc.c ${INCLS} ${SRCDIR}/include/afs/vice.h +ktc.krb.o: ktc.c ${INCLS} ${TOP_INCDIR}/afs/vice.h ${CC} ${CFLAGS} -DAFS_KERBEROS_ENV -c ktc.c -o ktc.krb.o libauth.a: $(OBJS) AFS_component_version_number.o @@ -114,31 +127,24 @@ ${UKERNELDIR}/afs/authcon.c: authcon.c ${UKERNELDIR}/afs/ktc_errors.c: ktc_errors.c ${INSTALL} $? $@ -install: kinstall ukinstall \ - ${DESTDIR}/lib/afs/libauth.a \ - ${DESTDIR}/lib/afs/libauth.krb.a \ - ${DESTDIR}/include/afs/keys.h \ - ${DESTDIR}/include/afs/cellconfig.h \ - ${DESTDIR}/include/afs/auth.h \ - ${DESTDIR}/etc/copyauth \ - setkey +install: ${DESTDIR}${libdir}/afs/libauth.a ${DESTDIR}${libdir}/afs/libauth.krb.a ${DESTDIR}${includedir}/afs/keys.h ${DESTDIR}${includedir}/afs/cellconfig.h ${DESTDIR}${includedir}/afs/auth.h ${DESTDIR}${sbindir}/copyauth -${DESTDIR}/lib/afs/libauth.a: libauth.a +${DEST}/lib/afs/libauth.a: libauth.a ${INSTALL} $? $@ -${DESTDIR}/lib/afs/libauth.krb.a: libauth.krb.a +${DEST}/lib/afs/libauth.krb.a: libauth.krb.a ${INSTALL} $? $@ -${DESTDIR}/etc/copyauth: copyauth +${DEST}/etc/copyauth: copyauth ${INSTALL} $? $@ -${DESTDIR}/include/afs/keys.h: keys.h +${DEST}/include/afs/keys.h: keys.h ${INSTALL} $? $@ -${DESTDIR}/include/afs/cellconfig.h: cellconfig.h +${DEST}/include/afs/cellconfig.h: cellconfig.h ${INSTALL} $? $@ -${DESTDIR}/include/afs/auth.h: auth.h +${DEST}/include/afs/auth.h: auth.h ${INSTALL} $? $@ # @@ -152,3 +158,38 @@ clean: AFS_component_version_number.c include ../config/Makefile.version +${DESTDIR}${libdir}/afs/libauth.a: libauth.a + ${INSTALL} $? $@ + +${TOP_LIBDIR}/libauth.a: libauth.a + ${INSTALL} $? $@ + +${DESTDIR}${libdir}/afs/libauth.krb.a: libauth.krb.a + ${INSTALL} $? $@ + +${TOP_LIBDIR}/libauth.krb.a: libauth.krb.a + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/keys.h: keys.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/keys.h: keys.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/cellconfig.h: cellconfig.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/cellconfig.h: cellconfig.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/auth.h: auth.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/auth.h: auth.h + ${INSTALL} $? $@ + +${DESTDIR}${sbindir}/copyauth: copyauth + ${INSTALL} $? $@ + +dest: ${DEST}/lib/afs/libauth.a ${DEST}/lib/afs/libauth.krb.a ${DEST}/include/afs/keys.h ${DEST}/include/afs/cellconfig.h ${DEST}/include/afs/auth.h ${DEST}/etc/copyauth + diff --git a/src/auth/test/Makefile.in b/src/auth/test/Makefile.in index 312b67d..9f8254d 100644 --- a/src/auth/test/Makefile.in +++ b/src/auth/test/Makefile.in @@ -22,7 +22,7 @@ LIBS= -lauth -lsys -lrx -llwp -lafsutil ${XLIBS} CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${XCFLAGS} -tests system all: testcellconf ktctest +tests all: testcellconf ktctest testcellconf: testcellconf.o $(CC) $(CFLAGS) -o testcellconf testcellconf.o ${LIBS} @@ -32,3 +32,7 @@ ktctest: ktctest.o clean: $(RM) -f *.o *.a copyauth testcellconf ktctest setkey auth.h cellconfig.h acfg_errors.c ktc_errors.c core + +install: + +dest: diff --git a/src/bozo/Makefile.in b/src/bozo/Makefile.in index 51fa83a..cafaed0 100644 --- a/src/bozo/Makefile.in +++ b/src/bozo/Makefile.in @@ -5,8 +5,21 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -14,40 +27,40 @@ SHELL=/bin/sh include ../config/Makefile.${SYS_NAME} -COMPILE_ET=${SRCDIR}/bin/compile_et -CFLAGS=-g -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS} -RPCINCLS=${SRCDIR}/include/lwp.h ${SRCDIR}/include/rx/rx.h bosint.h +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +CFLAGS=-g -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} +RPCINCLS=${TOP_INCDIR}/lwp.h ${TOP_INCDIR}/rx/rx.h bosint.h -INCLS= bnode.h \ +INCLS=bnode.h \ ${RPCINCLS} \ - ${SRCDIR}/include/afs/auth.h \ - ${SRCDIR}/include/afs/keys.h \ - ${SRCDIR}/include/afs/cellconfig.h \ - ${SRCDIR}/include/afs/cmd.h \ - ${SRCDIR}/include/afs/ktime.h + ${TOP_INCDIR}/afs/auth.h \ + ${TOP_INCDIR}/afs/keys.h \ + ${TOP_INCDIR}/afs/cellconfig.h \ + ${TOP_INCDIR}/afs/cmd.h \ + ${TOP_INCDIR}/afs/ktime.h # EH 12/18/90 - have to search librx.a twice on Ultrix 4.0 -LIBS= ${SRCDIR}/lib/librx.a \ - ${SRCDIR}/lib/liblwp.a \ - ${SRCDIR}/lib/afs/libcmd.a \ - ${SRCDIR}/lib/afs/libkauth.a \ - ${SRCDIR}/lib/afs/libvolser.a \ - ${SRCDIR}/lib/afs/libvldb.a \ - ${SRCDIR}/lib/afs/libauth.a \ - ${SRCDIR}/lib/librxstat.a \ - ${SRCDIR}/lib/librxkad.a \ - ${SRCDIR}/lib/libdes.a \ - ${SRCDIR}/lib/librx.a \ - ${SRCDIR}/lib/libubik.a \ - ${SRCDIR}/lib/afs/libcom_err.a \ - ${SRCDIR}/lib/afs/util.a \ - ${SRCDIR}/lib/afs/libsys.a \ - ${SRCDIR}/lib/afs/libprocmgmt.a +LIBS=${TOP_LIBDIR}/librx.a \ + ${TOP_LIBDIR}/liblwp.a \ + ${TOP_LIBDIR}/libcmd.a \ + ${TOP_LIBDIR}/libkauth.a \ + ${TOP_LIBDIR}/libvolser.a \ + ${TOP_LIBDIR}/libvldb.a \ + ${TOP_LIBDIR}/libauth.a \ + ${TOP_LIBDIR}/librxstat.a \ + ${TOP_LIBDIR}/librxkad.a \ + ${TOP_LIBDIR}/libdes.a \ + ${TOP_LIBDIR}/librx.a \ + ${TOP_LIBDIR}/libubik.a \ + ${TOP_LIBDIR}/libcom_err.a \ + ${TOP_LIBDIR}/util.a \ + ${TOP_LIBDIR}/libsys.a \ + ${TOP_LIBDIR}/libprocmgmt.a OBJS=bosserver.o bnode.o ezbnodeops.o fsbnodeops.o bosint.ss.o bosint.xdr.o \ bosoprocs.o cronbnodeops.o -all: install +all: bosserver ${TOP_INCDIR}/afs/bosint.h bos ${TOP_LIBDIR}/libbos.a ${TOP_INCDIR}/afs/bnode.h $(OBJS) bosint.xdr.o bosint.cs.o boserr.o: $(INCLS) @@ -56,7 +69,7 @@ bosint.xdr.o: bosint.xdr.c ${RPCINCLS} bosint.cs.o: bosint.cs.c ${RPCINCLS} bosint.xdr.c bosint.ss.c bosint.cs.c bosint.h: bosint.xg - ${SRCDIR}/bin/rxgen -x bosint.xg + ${RXGEN} -x bosint.xg bnode.h boserr.c: bnode.p.h boserr.et $(RM) -f boserr.c bnode.h; $(COMPILE_ET) boserr -h bnode @@ -84,34 +97,35 @@ libbos.a: bosint.xdr.o bosint.cs.o boserr.o AFS_component_version_number.o $(RANLIB) $@ bosserver: $(OBJS) $(LIBS) - ${CC} $(CFLAGS) -o bosserver $(OBJS) ${SRCDIR}/lib/afs/libaudit.a $(LIBS) ${XLIBS} + ${CC} $(CFLAGS) -o bosserver $(OBJS) ${TOP_LIBDIR}/libaudit.a $(LIBS) ${XLIBS} # # Install targets # -install: ${DESTDIR}/root.server/usr/afs/bin/bosserver \ - ${DESTDIR}/include/afs/bosint.h \ - ${DESTDIR}/bin/bos \ - ${DESTDIR}/root.server/usr/afs/bin/bos \ - ${DESTDIR}/lib/afs/libbos.a \ - ${DESTDIR}/include/afs/bnode.h - -${DESTDIR}/root.server/usr/afs/bin/bosserver: bosserver +install: \ + ${DESTDIR}${afssrvsbindir}/bosserver \ + ${DESTDIR}${includedir}/afs/bosint.h \ + ${DESTDIR}${bindir}/bos \ + ${DESTDIR}${afssrvbindir}/bos \ + ${DESTDIR}${libdir}/afs/libbos.a \ + ${DESTDIR}${includedir}/afs/bnode.h + +${DEST}/root.server/usr/afs/bin/bosserver: bosserver ${INSTALL} $? $@ -${DESTDIR}/include/afs/bosint.h: bosint.h +${DEST}/include/afs/bosint.h: bosint.h ${INSTALL} $? $@ -${DESTDIR}/bin/bos: bos +${DEST}/bin/bos: bos ${INSTALL} $? $@ -${DESTDIR}/root.server/usr/afs/bin/bos: bos +${DEST}/root.server/usr/afs/bin/bos: bos ${INSTALL} $? $@ -${DESTDIR}/lib/afs/libbos.a: libbos.a +${DEST}/lib/afs/libbos.a: libbos.a ${INSTALL} $? $@ -${DESTDIR}/include/afs/bnode.h: bnode.h +${DEST}/include/afs/bnode.h: bnode.h ${INSTALL} $? $@ # @@ -125,3 +139,38 @@ test: cd test; $(MAKE) include ../config/Makefile.version +${DESTDIR}${afssrvsbindir}/bosserver: bosserver + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/bosint.h: bosint.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/bosint.h: bosint.h + ${INSTALL} $? $@ + +${DESTDIR}${bindir}/bos: bos + ${INSTALL} $? $@ + +${DESTDIR}${afssrvbindir}/bos: bos + ${INSTALL} $? $@ + +${DESTDIR}${libdir}/afs/libbos.a: libbos.a + ${INSTALL} $? $@ + +${TOP_LIBDIR}/libbos.a: libbos.a + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/bnode.h: bnode.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/bnode.h: bnode.h + ${INSTALL} $? $@ + +dest: \ + ${DEST}/root.server/usr/afs/bin/bosserver \ + ${DEST}/include/afs/bosint.h \ + ${DEST}/bin/bos \ + ${DEST}/root.server/usr/afs/bin/bos \ + ${DEST}/lib/afs/libbos.a \ + ${DEST}/include/afs/bnode.h + diff --git a/src/bozo/test/Makefile.in b/src/bozo/test/Makefile.in index b783733..4350da0 100644 --- a/src/bozo/test/Makefile.in +++ b/src/bozo/test/Makefile.in @@ -5,21 +5,35 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ OPTIMIZE=-O -INCDIRS= -I${DESTDIR}/include -I.. -LDIRS= -L${DESTDIR}/lib -L${DESTDIR}/lib/afs -L.. +INCDIRS=-I${TOP_INCDIR} -I.. +LDIRS=-L${TOP_LIBDIR} -L${DESTDIR}/lib/afs -L.. CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS} -all: install +all: testproc smail-notifier -install: testproc smail-notifier +install: # # Build targets @@ -36,3 +50,5 @@ smail-notifier: smail-notifier.c clean: $(RM) -f *.a *.o testproc smail-notifier core +dest: + diff --git a/src/bu_utils/Makefile.in b/src/bu_utils/Makefile.in index 5ca0321..6fcbc06 100644 --- a/src/bu_utils/Makefile.in +++ b/src/bu_utils/Makefile.in @@ -5,8 +5,22 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -14,28 +28,33 @@ SHELL = /bin/sh include ../config/Makefile.${SYS_NAME} -CFLAGS= -g -w -I${TOP_SRCDIR}/config -I${SRCDIR}/include -I${SRCDIR}/include/afs ${XCFLAGS} +CFLAGS=-g -w -I${TOP_SRCDIR}/config -I${TOP_INCDIR} -I${TOP_INCDIR}/afs ${XCFLAGS} LDFLAGS = ${XLDFLAGS} -all: install +all: fms -FMSLIBS=${DESTDIR}/lib/afs/libcmd.a \ +FMSLIBS=${TOP_LIBDIR}/libcmd.a \ ${TXLIBS} \ - ${SRCDIR}/lib/afs/libusd.a \ - ${SRCDIR}/lib/afs/libtermlib.a ${XLIBS} \ - ${SRCDIR}/lib/afs/util.a + ${TOP_LIBDIR}/libusd.a \ + ${TOP_LIBDIR}/libtermlib.a ${XLIBS} \ + ${TOP_LIBDIR}/util.a fms: fms.o ${CC} ${LDFLAGS} -o fms fms.o ${FMSLIBS} fms.o: fms.c AFS_component_version_number.o -install: ${DESTDIR}/etc/fms +install: ${DESTDIR}${sbindir}/fms -${DESTDIR}/etc/fms: fms +${DEST}/etc/fms: fms ${INSTALL} $? $@ clean: $(RM) -f *.o fms AFS_component_version_number.c include ../config/Makefile.version +${DESTDIR}${sbindir}/fms: fms + ${INSTALL} $? $@ + +dest: ${DEST}/etc/fms + diff --git a/src/bubasics/Makefile.in b/src/bubasics/Makefile.in index a471220..0420d73 100644 --- a/src/bubasics/Makefile.in +++ b/src/bubasics/Makefile.in @@ -5,8 +5,20 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -14,12 +26,12 @@ SHELL = /bin/sh include ../config/Makefile.${SYS_NAME} -RXGEN=${SRCDIR}/bin/rxgen -COMPILE_ET = ${SRCDIR}/bin/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et -CFLAGS= ${DBUG} -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS} +CFLAGS=${DBUG} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} -all: install +all: ${TOP_LIBDIR}/libbubasics.a ${TOP_INCDIR}/afs/bumon.h ${TOP_INCDIR}/afs/butc.h ${TOP_INCDIR}/afs/bubasics.h ${TOP_INCDIR}/afs/tcdata.h ${TOP_INCDIR}/afs/butm.h ${TOP_INCDIR}/afs/butx.h OBJS=butc.ss.o butc.cs.o butc.xdr.o bumon.ss.o bumon.cs.o bumon.xdr.o butc_errs.o butm_errs.o butx_errs.o @@ -49,33 +61,27 @@ butx_errs.c butx.h: butx_errs.et # # Installation targets # -install: ${DESTDIR}/lib/afs/libbubasics.a \ - ${DESTDIR}/include/afs/bumon.h \ - ${DESTDIR}/include/afs/butc.h \ - ${DESTDIR}/include/afs/bubasics.h \ - ${DESTDIR}/include/afs/tcdata.h \ - ${DESTDIR}/include/afs/butm.h \ - ${DESTDIR}/include/afs/butx.h +install: ${DESTDIR}${libdir}/afs/libbubasics.a ${DESTDIR}${includedir}/afs/bumon.h ${DESTDIR}${includedir}/afs/butc.h ${DESTDIR}${includedir}/afs/bubasics.h ${DESTDIR}${includedir}/afs/tcdata.h ${DESTDIR}${includedir}/afs/butm.h ${DESTDIR}${includedir}/afs/butx.h -${DESTDIR}/lib/afs/libbubasics.a: libbubasics.a +${DEST}/lib/afs/libbubasics.a: libbubasics.a ${INSTALL} $? $@ -${DESTDIR}/include/afs/bumon.h: bumon.h +${DEST}/include/afs/bumon.h: bumon.h ${INSTALL} $? $@ -${DESTDIR}/include/afs/butc.h: butc.h +${DEST}/include/afs/butc.h: butc.h ${INSTALL} $? $@ -${DESTDIR}/include/afs/bubasics.h: bubasics.h +${DEST}/include/afs/bubasics.h: bubasics.h ${INSTALL} $? $@ -${DESTDIR}/include/afs/tcdata.h: tcdata.h +${DEST}/include/afs/tcdata.h: tcdata.h ${INSTALL} $? $@ -${DESTDIR}/include/afs/butm.h: butm.h +${DEST}/include/afs/butm.h: butm.h ${INSTALL} $? $@ -${DESTDIR}/include/afs/butx.h: butx.h +${DEST}/include/afs/butx.h: butx.h ${INSTALL} $? $@ # @@ -87,3 +93,47 @@ clean: butc_errs.c butx_errs.c butm_errs.c core AFS_component_version_number.c include ../config/Makefile.version +${DESTDIR}${libdir}/afs/libbubasics.a: libbubasics.a + ${INSTALL} $? $@ + +${TOP_LIBDIR}/libbubasics.a: libbubasics.a + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/bumon.h: bumon.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/bumon.h: bumon.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/butc.h: butc.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/butc.h: butc.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/bubasics.h: bubasics.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/bubasics.h: bubasics.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/tcdata.h: tcdata.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/tcdata.h: tcdata.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/butm.h: butm.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/butm.h: butm.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/butx.h: butx.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/butx.h: butx.h + ${INSTALL} $? $@ + +dest: ${DEST}/lib/afs/libbubasics.a ${DEST}/include/afs/bumon.h ${DEST}/include/afs/butc.h ${DEST}/include/afs/bubasics.h ${DEST}/include/afs/tcdata.h ${DEST}/include/afs/butm.h ${DEST}/include/afs/butx.h + diff --git a/src/bucoord/Makefile.in b/src/bucoord/Makefile.in index 3ce9fd2..55e8c96 100644 --- a/src/bucoord/Makefile.in +++ b/src/bucoord/Makefile.in @@ -5,8 +5,20 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -14,40 +26,39 @@ SHELL = /bin/sh include ../config/Makefile.${SYS_NAME} -COMPILE_ET = ${SRCDIR}/bin/compile_et -RXGEN=${SRCDIR}/bin/rxgen +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen -CFLAGS= ${DBUG} -w -I${TOP_SRCDIR}/config \ - -I${SRCDIR}/include -I${SRCDIR}/include/afs ${XCFLAGS} +CFLAGS=${DBUG} -w -I${TOP_SRCDIR}/config \ + -I${TOP_INCDIR} -I${TOP_INCDIR}/afs ${XCFLAGS} -LIBS=${SRCDIR}/lib/afs/libbudb.a ${SRCDIR}/lib/afs/libbubasics.a \ - ${SRCDIR}/lib/afs/libbutm.a ${SRCDIR}/lib/afs/libvolser.a \ - ${SRCDIR}/lib/afs/libvldb.a ${SRCDIR}/lib/afs/vlib.a \ - ${SRCDIR}/lib/afs/libkauth.a ${SRCDIR}/lib/libubik.a \ - ${SRCDIR}/lib/afs/libauth.a ${SRCDIR}/lib/librxkad.a \ - ${SRCDIR}/lib/afs/libsys.a ${SRCDIR}/lib/libdes.a \ - ${SRCDIR}/lib/librx.a ${SRCDIR}/lib/afs/libsys.a \ - ${SRCDIR}/lib/liblwp.a ${SRCDIR}/lib/afs/libcmd.a \ - ${SRCDIR}/lib/afs/libcom_err.a ${SRCDIR}/lib/afs/util.a +LIBS=${TOP_LIBDIR}/libbudb.a ${TOP_LIBDIR}/libbubasics.a \ + ${TOP_LIBDIR}/libbutm.a ${TOP_LIBDIR}/libvolser.a \ + ${TOP_LIBDIR}/libvldb.a ${TOP_LIBDIR}/vlib.a \ + ${TOP_LIBDIR}/libkauth.a ${TOP_LIBDIR}/libubik.a \ + ${TOP_LIBDIR}/libauth.a ${TOP_LIBDIR}/librxkad.a \ + ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/libdes.a \ + ${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/libsys.a \ + ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/libcmd.a \ + ${TOP_LIBDIR}/libcom_err.a ${TOP_LIBDIR}/util.a -all: install +all: ${TOP_LIBDIR}/libbxdb.a backup libbxdb.a: dsstub.o ubik_db_if.o status.o dlq.o bucoord_errs.o volstub.o AFS_component_version_number.o -$(RM) -f $@ $(AR) crv $@ dsstub.o ubik_db_if.o status.o dlq.o bucoord_errs.o volstub.o AFS_component_version_number.o $(RANLIB) $@ -ttest: ttest.o ${SRCDIR}/lib/librx.a ${SRCDIR}/lib/liblwp.a libbxdb.a +ttest: ttest.o ${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/liblwp.a libbxdb.a ${CC} ${CFLAGS} -o ttest ttest.o libbxdb.a \ - ${SRCDIR}/lib/afs/libbubasics.a \ - ${SRCDIR}/lib/librx.a ${SRCDIR}/lib/liblwp.a + ${TOP_LIBDIR}/libbubasics.a \ + ${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/liblwp.a ttest.o: AFS_component_version_number.c -btest: btest.o ${SRCDIR}/lib/afs/libbubasics.a ${SRCDIR}/lib/librx.a \ - ${SRCDIR}/lib/liblwp.a - ${CC} ${CFLAGS} -o btest btest.o ${SRCDIR}/lib/afs/libbubasics.a \ - ${SRCDIR}/lib/librx.a ${SRCDIR}/lib/liblwp.a +btest: btest.o ${TOP_LIBDIR}/libbubasics.a ${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/liblwp.a + ${CC} ${CFLAGS} -o btest btest.o ${TOP_LIBDIR}/libbubasics.a \ + ${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/liblwp.a btest.o: AFS_component_version_number.c @@ -62,7 +73,7 @@ BACKOBJS = main.o config.o dsstub.o volstub.o commands.o regex.o server.o \ main.o: AFS_component_version_number.c -$(BACKOBJS): bc.h ${SRCDIR}/include/afs/butc.h +$(BACKOBJS): bc.h ${TOP_INCDIR}/afs/butc.h backup: $(BACKOBJS) ${LIBS} ${CC} ${CFLAGS} -o backup $(BACKOBJS) ${LIBS} ${XLIBS} @@ -75,13 +86,12 @@ bucoord_errs.c bc.h: bucoord_errs.et bc.p.h # Install targets # -install: ${DESTDIR}/lib/afs/libbxdb.a \ - ${DESTDIR}/etc/backup +install: ${DESTDIR}${libdir}/afs/libbxdb.a ${DESTDIR}${sbindir}/backup -${DESTDIR}/lib/afs/libbxdb.a: libbxdb.a +${DEST}/lib/afs/libbxdb.a: libbxdb.a ${INSTALL} $? $@ -${DESTDIR}/etc/backup: backup +${DEST}/etc/backup: backup ${INSTALL} $? $@ # @@ -92,3 +102,14 @@ clean: $(RM) -f *.o backup convert *.ss.c *.cs.c *.xdr.c *.a core btest ttest AFS_component_version_number.c bc.h bucoord_errs.c include ../config/Makefile.version +${DESTDIR}${libdir}/afs/libbxdb.a: libbxdb.a + ${INSTALL} $? $@ + +${TOP_LIBDIR}/libbxdb.a: libbxdb.a + ${INSTALL} $? $@ + +${DESTDIR}${sbindir}/backup: backup + ${INSTALL} $? $@ + +dest: ${DEST}/lib/afs/libbxdb.a ${DEST}/etc/backup + diff --git a/src/budb/Makefile.in b/src/budb/Makefile.in index 9051616..701dd61 100644 --- a/src/budb/Makefile.in +++ b/src/budb/Makefile.in @@ -6,8 +6,20 @@ # directory or online at http://www.openafs.org/dl/license10.html # */ -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -15,48 +27,48 @@ SHELL = /bin/sh include ../config/Makefile.${SYS_NAME} -COMPILE_ET = ${SRCDIR}/bin/compile_et -RXGEN=${SRCDIR}/bin/rxgen +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen -CFLAGS = -g -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS} +CFLAGS=-g -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} LDFLAGS = -g ${XLDFLAGS} -INCLS= \ - ${SRCDIR}/include/lock.h \ - ${SRCDIR}/include/ubik.h \ - ${SRCDIR}/include/lwp.h \ - ${SRCDIR}/include/des.h \ - ${SRCDIR}/include/rx/rx.h \ - ${SRCDIR}/include/rx/xdr.h \ - ${SRCDIR}/include/rx/rxkad.h \ - ${SRCDIR}/include/afs/auth.h \ - ${SRCDIR}/include/afs/cellconfig.h \ - ${SRCDIR}/include/afs/com_err.h \ - ${SRCDIR}/include/afs/bubasics.h \ +INCLS=\ + ${TOP_INCDIR}/lock.h \ + ${TOP_INCDIR}/ubik.h \ + ${TOP_INCDIR}/lwp.h \ + ${TOP_INCDIR}/des.h \ + ${TOP_INCDIR}/rx/rx.h \ + ${TOP_INCDIR}/rx/xdr.h \ + ${TOP_INCDIR}/rx/rxkad.h \ + ${TOP_INCDIR}/afs/auth.h \ + ${TOP_INCDIR}/afs/cellconfig.h \ + ${TOP_INCDIR}/afs/com_err.h \ + ${TOP_INCDIR}/afs/bubasics.h \ budb.h budb_client.h database.h # library ordering defined by top level makefile -LIBS= ${SRCDIR}/lib/afs/libbubasics.a \ - ${SRCDIR}/lib/afs/libaudit.a \ - ${SRCDIR}/lib/afs/libprot.a \ - ${SRCDIR}/lib/afs/libkauth.a \ - ${SRCDIR}/lib/libubik.a \ - ${SRCDIR}/lib/afs/libauth.a \ - ${SRCDIR}/lib/librxkad.a \ - ${SRCDIR}/lib/afs/libsys.a \ - ${SRCDIR}/lib/libdes.a \ - ${SRCDIR}/lib/librx.a \ - ${SRCDIR}/lib/afs/libsys.a \ - ${SRCDIR}/lib/liblwp.a \ - ${SRCDIR}/lib/afs/libcmd.a \ - ${SRCDIR}/lib/afs/libcom_err.a \ - ${SRCDIR}/lib/afs/util.a +LIBS=${TOP_LIBDIR}/libbubasics.a \ + ${TOP_LIBDIR}/libaudit.a \ + ${TOP_LIBDIR}/libprot.a \ + ${TOP_LIBDIR}/libkauth.a \ + ${TOP_LIBDIR}/libubik.a \ + ${TOP_LIBDIR}/libauth.a \ + ${TOP_LIBDIR}/librxkad.a \ + ${TOP_LIBDIR}/libsys.a \ + ${TOP_LIBDIR}/libdes.a \ + ${TOP_LIBDIR}/librx.a \ + ${TOP_LIBDIR}/libsys.a \ + ${TOP_LIBDIR}/liblwp.a \ + ${TOP_LIBDIR}/libcmd.a \ + ${TOP_LIBDIR}/libcom_err.a \ + ${TOP_LIBDIR}/util.a COMMON_OBJS = database.o db_alloc.o db_dump.o db_hash.o struct_ops.o ol_verify.o SERVER_OBJS = ${COMMON_OBJS} budb.ss.o budb.xdr.o dbs_dump.o db_lock.o db_text.o \ procs.o server.o budb_errs.o -all: install +all: ${TOP_LIBDIR}/libbudb.a ${TOP_INCDIR}/afs/budb.h ${TOP_INCDIR}/afs/budb_errs.h ${TOP_INCDIR}/afs/budb_client.h budb_server budb_errs.o: budb_errs.c @@ -91,25 +103,26 @@ libbudb.a: budb_errs.o budb.cs.o budb.xdr.o struct_ops.o AFS_component_version_n # # Install targets # -install: ${DESTDIR}/lib/afs/libbudb.a \ - ${DESTDIR}/include/afs/budb.h \ - ${DESTDIR}/include/afs/budb_errs.h \ - ${DESTDIR}/include/afs/budb_client.h \ - ${DESTDIR}/root.server/usr/afs/bin/buserver - -${DESTDIR}/lib/afs/libbudb.a: libbudb.a +install: \ + ${DESTDIR}${libdir}/afs/libbudb.a \ + ${DESTDIR}${includedir}/afs/budb.h \ + ${DESTDIR}${includedir}/afs/budb_errs.h \ + ${DESTDIR}${includedir}/afs/budb_client.h \ + ${DESTDIR}${afssrvlibexecdir}/buserver + +${DEST}/lib/afs/libbudb.a: libbudb.a ${INSTALL} $? $@ -${DESTDIR}/include/afs/budb.h: budb.h +${DEST}/include/afs/budb.h: budb.h ${INSTALL} $? $@ -${DESTDIR}/include/afs/budb_errs.h: budb_errs.h +${DEST}/include/afs/budb_errs.h: budb_errs.h ${INSTALL} $? $@ -${DESTDIR}/include/afs/budb_client.h: budb_client.h +${DEST}/include/afs/budb_client.h: budb_client.h ${INSTALL} $? $@ -${DESTDIR}/root.server/usr/afs/bin/buserver: budb_server +${DEST}/root.server/usr/afs/bin/buserver: budb_server ${INSTALL} -f $? $@ # @@ -120,3 +133,37 @@ clean: *.ss.c *.cs.c core budb_server AFS_component_version_number.c include ../config/Makefile.version +${DESTDIR}${libdir}/afs/libbudb.a: libbudb.a + ${INSTALL} $? $@ + +${TOP_LIBDIR}/libbudb.a: libbudb.a + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/budb.h: budb.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/budb.h: budb.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/budb_errs.h: budb_errs.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/budb_errs.h: budb_errs.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/budb_client.h: budb_client.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/budb_client.h: budb_client.h + ${INSTALL} $? $@ + +${DESTDIR}${afssrvlibexecdir}/buserver: budb_server + ${INSTALL} -f $? $@ + +dest: \ + ${DEST}/lib/afs/libbudb.a \ + ${DEST}/include/afs/budb.h \ + ${DEST}/include/afs/budb_errs.h \ + ${DEST}/include/afs/budb_client.h \ + ${DEST}/root.server/usr/afs/bin/buserver + diff --git a/src/butc/Makefile.in b/src/butc/Makefile.in index 4d6e619..536ed19 100644 --- a/src/butc/Makefile.in +++ b/src/butc/Makefile.in @@ -5,8 +5,22 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -16,51 +30,49 @@ include ../config/Makefile.${SYS_NAME} CFLAGS=-g -w ${INCDIRS} ${XCFLAGS} -INCDIRS= -I${TOP_SRCDIR}/config -I${SRCDIR}/include/afs \ - -I${SRCDIR}/include/rx -I${SRCDIR}/include - -INCLS=${SRCDIR}/include/afs/partition.h ${SRCDIR}/include/afs/volume.h \ - ${SRCDIR}/include/afs/vlserver.h ${SRCDIR}/include/rx/rx.h \ - ${SRCDIR}/include/rx/xdr.h ${SRCDIR}/include/afs/keys.h \ - ${SRCDIR}/include/afs/cellconfig.h ${SRCDIR}/include/ubik.h \ - ${SRCDIR}/include/afs/cmd.h ${SRCDIR}/include/afs/butc.h \ - ${SRCDIR}/include/afs/tcdata.h ${SRCDIR}/include/afs/bubasics.h \ - ${SRCDIR}/include/afs/butm.h - -HACKS=${SRCDIR}/lib/afs/libdir.a - -INCLIBS=-L${SRCDIR}/lib/afs -L${SRCDIR}/lib - -LIBS=${SRCDIR}/lib/afs/libbudb.a \ - $(SRCDIR)/lib/afs/libbxdb.a \ - ${SRCDIR}/lib/afs/libbubasics.a \ - ${SRCDIR}/lib/afs/libbutm.a \ - ${SRCDIR}/lib/afs/libvolser.a \ - ${SRCDIR}/lib/afs/libvldb.a \ - ${SRCDIR}/lib/afs/vlib.a \ - ${SRCDIR}/lib/afs/libacl.a \ - ${SRCDIR}/lib/afs/libprot.a \ - ${SRCDIR}/lib/afs/libkauth.a \ - ${SRCDIR}/lib/libubik.a \ - ${SRCDIR}/lib/afs/libauth.a \ - ${SRCDIR}/lib/librxkad.a \ - ${SRCDIR}/lib/afs/libsys.a \ - ${SRCDIR}/lib/libdes.a \ - ${SRCDIR}/lib/librx.a \ - ${SRCDIR}/lib/afs/libsys.a \ - ${SRCDIR}/lib/liblwp.a \ - ${SRCDIR}/lib/afs/libcmd.a \ - ${SRCDIR}/lib/afs/libcom_err.a \ - ${SRCDIR}/lib/afs/util.a \ - ${SRCDIR}/lib/afs/libusd.a \ - ${SRCDIR}/lib/afs/libprocmgmt.a +INCDIRS=-I${TOP_SRCDIR}/config -I${TOP_INCDIR}/afs \ + -I${TOP_INCDIR}/rx -I${TOP_INCDIR} + +INCLS=${TOP_INCDIR}/afs/partition.h ${TOP_INCDIR}/afs/volume.h \ + ${TOP_INCDIR}/afs/vlserver.h ${TOP_INCDIR}/rx/rx.h \ + ${TOP_INCDIR}/rx/xdr.h ${TOP_INCDIR}/afs/keys.h \ + ${TOP_INCDIR}/afs/cellconfig.h ${TOP_INCDIR}/ubik.h \ + ${TOP_INCDIR}/afs/cmd.h ${TOP_INCDIR}/afs/butc.h \ + ${TOP_INCDIR}/afs/tcdata.h ${TOP_INCDIR}/afs/bubasics.h \ + ${TOP_INCDIR}/afs/butm.h + +HACKS=${TOP_LIBDIR}/libdir.a + +LIBS=${TOP_LIBDIR}/libbudb.a \ + $(TOP_LIBDIR)/libbxdb.a \ + ${TOP_LIBDIR}/libbubasics.a \ + ${TOP_LIBDIR}/libbutm.a \ + ${TOP_LIBDIR}/libvolser.a \ + ${TOP_LIBDIR}/libvldb.a \ + ${TOP_LIBDIR}/vlib.a \ + ${TOP_LIBDIR}/libacl.a \ + ${TOP_LIBDIR}/libprot.a \ + ${TOP_LIBDIR}/libkauth.a \ + ${TOP_LIBDIR}/libubik.a \ + ${TOP_LIBDIR}/libauth.a \ + ${TOP_LIBDIR}/librxkad.a \ + ${TOP_LIBDIR}/libsys.a \ + ${TOP_LIBDIR}/libdes.a \ + ${TOP_LIBDIR}/librx.a \ + ${TOP_LIBDIR}/libsys.a \ + ${TOP_LIBDIR}/liblwp.a \ + ${TOP_LIBDIR}/libcmd.a \ + ${TOP_LIBDIR}/libcom_err.a \ + ${TOP_LIBDIR}/util.a \ + ${TOP_LIBDIR}/libusd.a \ + ${TOP_LIBDIR}/libprocmgmt.a TESTOBJS=test.o SOBJS=dbentries.o tcprocs.o lwps.o tcmain.o list.o recoverDb.o tcudbprocs.o \ dump.o tcstatus.o -all: install +all: butc read_tape butc_test: ${TESTOBJS} ${LIBS} ${INCLS} ${HACKS} ${CC} ${CFLAGS} ${TESTOBJS} ${LIBS} ${XLIBS} -o butc_test @@ -87,20 +99,30 @@ tcstatus.o: tcstatus.c ${INCLS} read_tape: read_tape.c ${CC} ${CFLAGS} -o read_tape read_tape.c \ - ${SRCDIR}/lib/afs/libcmd.a ${SRCDIR}/lib/afs/util.a \ - ${SRCDIR}/lib/afs/libusd.a - ${INSTALL} read_tape ${SRCDIR}/etc + ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a \ + ${TOP_LIBDIR}/libusd.a clean: $(RM) -f butc *.o butc_test core tdump read_tape AFS_component_version_number.c -install: butc read_tape +install: @case ${SYS_NAME} in \ alpha_dux*|sgi_*|sun4x_*|rs_aix4*|*linux*|hp_ux*) \ echo "Don't install butc for ${SYS_NAME} (will install from tbutc)" ;; \ *) \ - echo ${INSTALL} butc ${DESTDIR}/etc/butc ; \ - ${INSTALL} butc ${DESTDIR}/etc/butc ;; \ + echo ${INSTALL} butc ${DESTDIR}${sbindir}/butc ; \ + ${INSTALL} butc ${DESTDIR}${sbindir}/butc ;; \ esac + ${INSTALL} read_tape ${DESTDIR}${sbindir}/read_tape include ../config/Makefile.version +dest: + @case ${SYS_NAME} in \ + alpha_dux*|sgi_*|sun4x_*|rs_aix4*|*linux*|hp_ux*) \ + echo "Don't install butc for ${SYS_NAME} (will install from tbutc)" ;; \ + *) \ + echo ${INSTALL} butc ${DEST}/etc/butc ; \ + ${INSTALL} butc ${DEST}/etc/butc ;; \ + esac + ${INSTALL} read_tape ${DEST}/etc/read_tape + diff --git a/src/butm/Makefile.in b/src/butm/Makefile.in index f19d203..81e322d 100644 --- a/src/butm/Makefile.in +++ b/src/butm/Makefile.in @@ -5,33 +5,47 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ SHELL = /bin/sh -CFLAGS = -g -w -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS} +CFLAGS=-g -w -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} LDFLAGS = -g ${XLDFLAGS} -INCLS= ${SRCDIR}/include/afs/com_err.h ${SRCDIR}/include/afs/butm.h - -LIBS=${SRCDIR}/lib/afs/libbubasics.a \ - ${SRCDIR}/lib/liblwp.a \ - ${SRCDIR}/lib/afs/libusd.a \ - ${SRCDIR}/lib/afs/libcom_err.a \ - ${SRCDIR}/lib/afs/libbutm.a \ - ${SRCDIR}/lib/afs/libcom_err.a \ - ${SRCDIR}/lib/afs/util.a \ +INCLS=${TOP_INCDIR}/afs/com_err.h ${TOP_INCDIR}/afs/butm.h + +LIBS=${TOP_LIBDIR}/libbubasics.a \ + ${TOP_LIBDIR}/liblwp.a \ + ${TOP_LIBDIR}/libusd.a \ + ${TOP_LIBDIR}/libcom_err.a \ + ${TOP_LIBDIR}/libbutm.a \ + ${TOP_LIBDIR}/libcom_err.a \ + ${TOP_LIBDIR}/util.a \ ${XLIBS} include ../config/Makefile.${SYS_NAME} -all: install +all: ${TOP_LIBDIR}/libbutm.a -install: ${DESTDIR}/lib/afs/libbutm.a +install: ${DESTDIR}${libdir}/afs/libbutm.a -${DESTDIR}/lib/afs/libbutm.a: libbutm.a +${DEST}/lib/afs/libbutm.a: libbutm.a ${INSTALL} $? $@ libbutm.a: file_tm.o AFS_component_version_number.o @@ -53,3 +67,11 @@ clean: $(RM) -f *.o *.a core test_ftm AFS_component_version_number.c include ../config/Makefile.version +${DESTDIR}${libdir}/afs/libbutm.a: libbutm.a + ${INSTALL} $? $@ + +${TOP_LIBDIR}/libbutm.a: libbutm.a + ${INSTALL} $? $@ + +dest: ${DEST}/lib/afs/libbutm.a + diff --git a/src/cmd/Makefile.in b/src/cmd/Makefile.in index 42dbccc..f564e1e 100644 --- a/src/cmd/Makefile.in +++ b/src/cmd/Makefile.in @@ -5,8 +5,21 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -14,14 +27,16 @@ SHELL = /bin/sh include ../config/Makefile.${SYS_NAME} -COMPILE_ET = ${SRCDIR}/bin/compile_et +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et LIBOBJS=cmd_errors.o cmd.o LIB64OBJS=cmd_errors64.o cmd64.o -CFLAGS= ${OPTMZ} -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS} +CFLAGS=${OPTMZ} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} -all: install +all: ${TOP_LIBDIR}/libcmd.a ${TOP_INCDIR}/afs/cmd.h + +all64: all ${TOP_LIBDIR}/libcmd64.a cmd.h cmd_errors.c: cmd_errors.et cmd.p.h $(RM) -f cmd.h cmd_errors.c @@ -32,10 +47,10 @@ cmd_errors.o: cmd_errors.c cmd.o: cmd.c cmd.h cmd_errors64.o: cmd_errors.c - ${CC} ${OPTMZ} -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS64} -c -o cmd_errors64.o cmd_errors.c + ${CC} ${OPTMZ} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS64} -c -o cmd_errors64.o cmd_errors.c cmd64.o: cmd.c cmd.h - ${CC} ${OPTMZ} -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS64} -c -o cmd64.o cmd.c + ${CC} ${OPTMZ} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS64} -c -o cmd64.o cmd.c libcmd64.a: ${LIB64OBJS} AFS_component_version_number64.o @@ -49,22 +64,22 @@ libcmd.a: ${LIBOBJS} AFS_component_version_number.o $(RANLIB) $@ AFS_component_version_number64.o: AFS_component_version_number.c - ${CC} ${OPTMZ} -I${SRCDIR}/include ${XCFLAGS64} -c -o AFS_component_version_number64.o AFS_component_version_number.c + ${CC} ${OPTMZ} -I${TOP_INCDIR} ${XCFLAGS64} -c -o AFS_component_version_number64.o AFS_component_version_number.c # # Install targets # -install: ${DESTDIR}/lib/afs/libcmd.a ${DESTDIR}/include/afs/cmd.h +install: ${DESTDIR}${libdir}/afs/libcmd.a ${DESTDIR}${includedir}/afs/cmd.h -install64: install ${DESTDIR}/lib/afs/libcmd64.a +install64: install ${DESTDIR}${libdir}/afs/libcmd64.a -${DESTDIR}/include/afs/cmd.h: cmd.h +${DEST}/include/afs/cmd.h: cmd.h ${INSTALL} $? $@ -${DESTDIR}/lib/afs/libcmd.a: libcmd.a +${DEST}/lib/afs/libcmd.a: libcmd.a ${INSTALL} $? $@ -${DESTDIR}/lib/afs/libcmd64.a: libcmd64.a +${DEST}/lib/afs/libcmd64.a: libcmd64.a ${INSTALL} $? $@ # @@ -77,3 +92,24 @@ clean: $(RM) -f *.a *.o ctest dtest cmd.h cmd_errors.c core AFS_component_version_number.c include ../config/Makefile.version +${DESTDIR}${libdir}/afs/libcmd.a: libcmd.a + ${INSTALL} $? $@ + +${TOP_LIBDIR}/libcmd.a: libcmd.a + ${INSTALL} $? $@ + +${DESTDIR}${libdir}/afs/libcmd64.a: libcmd64.a + ${INSTALL} $? $@ + +${TOP_LIBDIR}/libcmd64.a: libcmd64.a + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/cmd.h: cmd.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/cmd.h: cmd.h + ${INSTALL} $? $@ + +dest: ${DEST}/lib/afs/libcmd.a ${DEST}/include/afs/cmd.h + +dest64: dest ${DEST}/lib/afs/libcmd64.a diff --git a/src/cmd/test/Makefile.in b/src/cmd/test/Makefile.in index c27c9a3..fc01361 100644 --- a/src/cmd/test/Makefile.in +++ b/src/cmd/test/Makefile.in @@ -43,3 +43,5 @@ kinstall: clean: $(RM) -f *.a *.o ctest dtest itest core +install: +dest: diff --git a/src/comerr/Makefile.in b/src/comerr/Makefile.in index 412a9db..a7974b0 100644 --- a/src/comerr/Makefile.in +++ b/src/comerr/Makefile.in @@ -4,8 +4,22 @@ # Copyright 1987, 1989 MIT Student Information Processing Board # For copyright info, see mit-sipb-cr.h. -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -15,9 +29,9 @@ include ../config/Makefile.${SYS_NAME} UKERNELDIR=../libuafs/ -CFLAGS= ${OPTMZ} -I${DESTDIR}/include -I${TOP_SRCDIR}/config ${XCFLAGS} +CFLAGS=${OPTMZ} -I${TOP_INCDIR} -I${TOP_SRCDIR}/config ${XCFLAGS} -all: install +all: ukinstall compile_et ${TOP_INCDIR}/afs/com_err.h ${TOP_INCDIR}/afs/error_table.h ${TOP_INCDIR}/afs/mit-sipb-cr.h ${TOP_LIBDIR}/libcom_err.a et_lex.lex.c: et_lex.lex.l $(RM) -f et_lex.lex.c @@ -26,9 +40,9 @@ et_lex.lex.c: et_lex.lex.l compile_et: compile_et.o error_table.o case $(SYS_NAME) in \ *_linux* ) \ - ${CC} ${CFLAGS} -o compile_et compile_et.o error_table.o -L${DESTDIR}/lib/afs -lafsutil;; \ + ${CC} ${CFLAGS} -o compile_et compile_et.o error_table.o -L${TOP_LIBDIR} -lafsutil;; \ * ) \ - ${CC} ${CFLAGS} -o compile_et compile_et.o error_table.o -L${DESTDIR}/lib/afs -lafsutil -ll;; \ + ${CC} ${CFLAGS} -o compile_et compile_et.o error_table.o -L${TOP_LIBDIR} -lafsutil -ll;; \ esac libcom_err.a: error_msg.o et_name.o com_err.o AFS_component_version_number.o @@ -48,12 +62,7 @@ ukinstall: \ ${UKERNELDIR}/afs/internal.h \ ${UKERNELDIR}/afs/et_name.c -install: ukinstall \ - ${DESTDIR}/bin/compile_et \ - ${DESTDIR}/include/afs/com_err.h \ - ${DESTDIR}/include/afs/error_table.h \ - ${DESTDIR}/include/afs/mit-sipb-cr.h \ - ${DESTDIR}/lib/afs/libcom_err.a +install: ${DESTDIR}${bindir}/compile_et ${DESTDIR}${includedir}/afs/com_err.h ${DESTDIR}${includedir}/afs/error_table.h ${DESTDIR}${includedir}/afs/mit-sipb-cr.h ${DESTDIR}${libdir}/afs/libcom_err.a ${UKERNELDIR}/afs: mkdir -p $@ @@ -79,19 +88,19 @@ ${UKERNELDIR}/afs/internal.h: internal.h ${UKERNELDIR}/afs/et_name.c: et_name.c ${INSTALL} $? $@ -${DESTDIR}/bin/compile_et: compile_et +${DEST}/bin/compile_et: compile_et ${INSTALL} $? $@ -${DESTDIR}/include/afs/com_err.h: com_err.h +${DEST}/include/afs/com_err.h: com_err.h ${INSTALL} $? $@ -${DESTDIR}/include/afs/error_table.h: error_table.h +${DEST}/include/afs/error_table.h: error_table.h ${INSTALL} $? $@ -${DESTDIR}/include/afs/mit-sipb-cr.h: mit-sipb-cr.h +${DEST}/include/afs/mit-sipb-cr.h: mit-sipb-cr.h ${INSTALL} $? $@ -${DESTDIR}/lib/afs/libcom_err.a: libcom_err.a +${DEST}/lib/afs/libcom_err.a: libcom_err.a ${INSTALL} $? $@ clean: @@ -108,3 +117,32 @@ compile_et.o: AFS_component_version_number.c error_table.o: et_lex.lex.c include ../config/Makefile.version +${DESTDIR}${bindir}/compile_et: compile_et + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/com_err.h: com_err.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/com_err.h: com_err.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/error_table.h: error_table.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/error_table.h: error_table.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/mit-sipb-cr.h: mit-sipb-cr.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/mit-sipb-cr.h: mit-sipb-cr.h + ${INSTALL} $? $@ + +${DESTDIR}${libdir}/afs/libcom_err.a: libcom_err.a + ${INSTALL} $? $@ + +${TOP_LIBDIR}/libcom_err.a: libcom_err.a + ${INSTALL} $? $@ + +dest: ${DEST}/bin/compile_et ${DEST}/include/afs/com_err.h ${DEST}/include/afs/error_table.h ${DEST}/include/afs/mit-sipb-cr.h ${DEST}/lib/afs/libcom_err.a + diff --git a/src/comerr/test/Makefile.in b/src/comerr/test/Makefile.in index 29eaaab..186d63a 100644 --- a/src/comerr/test/Makefile.in +++ b/src/comerr/test/Makefile.in @@ -1,18 +1,32 @@ -TOP_SRCDIR=@DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ -TOP_SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen +TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ OPTIMIZE=-O -INCDIRS= -I${DESTDIR}/include -I.. -LDIRS= -L${DESTDIR}/lib -L${DESTDIR}/lib/afs -L.. +INCDIRS=-I${TOP_INCDIR} -I.. +LDIRS=-L${TOP_LIBDIR} -L${DESTDIR}/lib/afs -L.. CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} -lcom_err ${XCFLAGS} -all: install +all: test -install: test +install: # # Build targets @@ -40,3 +54,5 @@ clean: test1.h test1.c test2.h test2.c test \ eddep makedep core +dest: + diff --git a/src/config/Makefile.alpha_dux40.in b/src/config/Makefile.alpha_dux40.in index 6a3fe56..9884a72 100644 --- a/src/config/Makefile.alpha_dux40.in +++ b/src/config/Makefile.alpha_dux40.in @@ -21,8 +21,10 @@ OPTMZ=-O2 DBG=-g3 CSTATIC=-non_shared RANLIB=/bin/true -INSTALL=${DESTDIR}/bin/install +INSTALL=${TOP_SRCDIR}/pinstall/pinstall CP=cp #this is for the vol package -FS_CONV_OSF40D= $(DESTDIR)root.server/usr/afs/bin/fs_conv_dux40D +FS_CONV_OSF40D = fs_conv_dux40D +install_FS_CONV_OSF40D = $(DESTDIR)${afssrvsbindir}/fs_conv_dux40D +dest_FS_CONV_OSF40D = $(DEST)/root.server/usr/afs/bin/fs_conv_dux40D diff --git a/src/config/Makefile.alpha_dux50.in b/src/config/Makefile.alpha_dux50.in index e72e5f9..9c9546e 100644 --- a/src/config/Makefile.alpha_dux50.in +++ b/src/config/Makefile.alpha_dux50.in @@ -22,7 +22,9 @@ DBG=-g3 CP=cp CSTATIC=-non_shared RANLIB=/bin/true -INSTALL=${DESTDIR}/bin/install +INSTALL=${TOP_SRCDIR}/pinstall/pinstall #this is for the vol package -FS_CONV_OSF40D= $(DESTDIR)root.server/usr/afs/bin/fs_conv_dux40D +FS_CONV_OSF40D = fs_conv_dux40D +install_FS_CONV_OSF40D = $(DESTDIR)${afssrvsbindir}/fs_conv_dux40D +dest_FS_CONV_OSF40D = $(DEST)/root.server/usr/afs/bin/fs_conv_dux40D diff --git a/src/config/Makefile.alpha_linux_22.in b/src/config/Makefile.alpha_linux_22.in index cc1f544..eb760ee 100644 --- a/src/config/Makefile.alpha_linux_22.in +++ b/src/config/Makefile.alpha_linux_22.in @@ -32,7 +32,7 @@ XLIBS=@LIB_AFSDB@ AR=ar AS=as CP=cp -INSTALL=${SRCDIR}/bin/install +INSTALL=${TOP_SRCDIR}/pinstall/pinstall LD=ld MT_CC=cc MV=mv diff --git a/src/config/Makefile.hp_ux102.in b/src/config/Makefile.hp_ux102.in index fd7a25a..b0b318d 100644 --- a/src/config/Makefile.hp_ux102.in +++ b/src/config/Makefile.hp_ux102.in @@ -21,7 +21,7 @@ LWP_OPTMZ=-O OPTMZ=-O DBG=-g RANLIB=ranlib -INSTALL=${DESTDIR}/bin/install +INSTALL=${TOP_SRCDIR}/pinstall/pinstall RM=/bin/rm CP=/bin/cp AR=/bin/ar diff --git a/src/config/Makefile.hp_ux110.in b/src/config/Makefile.hp_ux110.in index e5c87b2..c07be9a 100644 --- a/src/config/Makefile.hp_ux110.in +++ b/src/config/Makefile.hp_ux110.in @@ -21,7 +21,7 @@ LWP_OPTMZ=-O OPTMZ=-O DBG=-g RANLIB=/usr/bin/ranlib -INSTALL=${DESTDIR}/bin/install +INSTALL=${TOP_SRCDIR}/pinstall/pinstall RM=/bin/rm CP=/bin/cp AR=/bin/ar diff --git a/src/config/Makefile.i386_fbsd_42.in b/src/config/Makefile.i386_fbsd_42.in index b1a8446..a8a0001 100644 --- a/src/config/Makefile.i386_fbsd_42.in +++ b/src/config/Makefile.i386_fbsd_42.in @@ -34,7 +34,7 @@ XLIBS=@LIB_AFSDB@ -lcompat AR=ar AS=as CP=cp -INSTALL=${SRCDIR}/bin/install +INSTALL=${TOP_SRCDIR}/pinstall/pinstall LD=ld MT_CC=cc MV=mv diff --git a/src/config/Makefile.i386_linux22.in b/src/config/Makefile.i386_linux22.in index c6c3415..5c14c95 100644 --- a/src/config/Makefile.i386_linux22.in +++ b/src/config/Makefile.i386_linux22.in @@ -43,7 +43,7 @@ MT_CC=cc MV=mv RANLIB=ranlib RM=rm -INSTALL=${DESTDIR}/bin/install +INSTALL=${TOP_SRCDIR}/pinstall/pinstall # # Other OS specific requirements # diff --git a/src/config/Makefile.i386_linux24.in b/src/config/Makefile.i386_linux24.in index c994a51..9635c31 100644 --- a/src/config/Makefile.i386_linux24.in +++ b/src/config/Makefile.i386_linux24.in @@ -35,7 +35,7 @@ MT_CC=cc MV=mv RANLIB=ranlib RM=rm -INSTALL=${DESTDIR}/bin/install +INSTALL=${TOP_SRCDIR}/pinstall/pinstall # # Other OS specific requirements # diff --git a/src/config/Makefile.in b/src/config/Makefile.in index 590b5fe..1cf3b9e 100644 --- a/src/config/Makefile.in +++ b/src/config/Makefile.in @@ -5,8 +5,22 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -16,11 +30,18 @@ SHELL=/bin/sh include Makefile.${SYS_NAME} -CFLAGS=-g -I${DESTDIR}/include ${XCFLAGS} +CFLAGS=-g -I${TOP_INCDIR} ${XCFLAGS} INST=$(RM) -f $@; $(CP) $? $@ -all: install +all: config mkvers ukinstall kinstall \ + ${TOP_INCDIR}/afs/param.h \ + ${TOP_INCDIR}/afs/stds.h \ + ${TOP_INCDIR}/afs/afs_sysnames.h \ + ${TOP_INCDIR}/afs/afs_args.h \ + ${TOP_INCDIR}/afs/icl.h \ + ${TOP_INCDIR}/afs/venus.h \ + ${TOP_INCDIR}/afs/debug.h Makefile.version: Makefile.version-CML Makefile.version-NOCML $(RM) -f Makefile.version @@ -53,12 +74,6 @@ mkvers: mkvers.c mc.o: mc.c config.o: config.c AFS_component_version_number.c -${DESTDIR}/bin: - mkdir -p $@ - -${DESTDIR}/bin/mkvers: mkvers - $(INST) - # # Include installation targets # @@ -78,33 +93,28 @@ UKDIRS = ${UKERNELDIR}/afs \ $(UKDIRS): mkdir -p $@ -HDIRS = ${DESTDIR}/include/afs - -$(HDIRS): - mkdir -p $@ - -${KERNELDIR}/afs/param.h ${DESTDIR}/include/afs/param.h: param.${SYS_NAME}.h +${KERNELDIR}/afs/param.h ${DEST}/include/afs/param.h ${DESTDIR}${includedir}/afs/param.h ${TOP_INCDIR}/afs/param.h: param.${SYS_NAME}.h -$(INST) -${UKERNELDIR}/afs/afs_sysnames.h ${KERNELDIR}/afs/afs_sysnames.h ${DESTDIR}/include/afs/afs_sysnames.h: afs_sysnames.h +${UKERNELDIR}/afs/afs_sysnames.h ${KERNELDIR}/afs/afs_sysnames.h ${DEST}/include/afs/afs_sysnames.h ${DESTDIR}${includedir}/afs/afs_sysnames.h ${TOP_INCDIR}/afs/afs_sysnames.h: afs_sysnames.h $(INST) -${UKERNELDIR}/afs/stds.h ${KERNELDIR}/afs/stds.h ${DESTDIR}/include/afs/stds.h: stds.h +${UKERNELDIR}/afs/stds.h ${KERNELDIR}/afs/stds.h ${DEST}/include/afs/stds.h ${DESTDIR}${includedir}/afs/stds.h ${TOP_INCDIR}/afs/stds.h: stds.h $(INST) ${UKERNELDIR}/config/Makefile.${SYS_NAME} ${KERNELDIR}/config/Makefile.${SYS_NAME}: Makefile.${SYS_NAME} $(INST) -${UKERNELDIR}/afs/icl.h ${KERNELDIR}/afs/icl.h ${DESTDIR}/include/afs/icl.h: icl.h +${UKERNELDIR}/afs/icl.h ${KERNELDIR}/afs/icl.h ${DEST}/include/afs/icl.h ${DESTDIR}${includedir}/afs/icl.h ${TOP_INCDIR}/afs/icl.h: icl.h $(INST) -${UKERNELDIR}/afs/afs_args.h ${KERNELDIR}/afs/afs_args.h ${DESTDIR}/include/afs/afs_args.h: afs_args.h +${UKERNELDIR}/afs/afs_args.h ${KERNELDIR}/afs/afs_args.h ${DEST}/include/afs/afs_args.h ${DESTDIR}${includedir}/afs/afs_args.h ${TOP_INCDIR}/afs/afs_args.h: afs_args.h $(INST) -${UKERNELDIR}/afs/venus.h ${DESTDIR}/include/afs/venus.h: venus.h +${UKERNELDIR}/afs/venus.h ${DEST}/include/afs/venus.h ${DESTDIR}${includedir}/afs/venus.h ${TOP_INCDIR}/afs/venus.h: venus.h $(INST) -${DESTDIR}/include/afs/debug.h: debug.h +${DEST}/include/afs/debug.h ${DESTDIR}${includedir}/afs/debug.h ${TOP_INCDIR}/afs/debug.h: debug.h $(INST) ${UKERNELDIR}/afs/param.h: param.${SYS_NAME}_usr.h @@ -115,22 +125,13 @@ ${UKERNELDIR}/afs/param.h: param.${SYS_NAME}_usr.h # kernel include environment. param.h is, well, param.h. The afs_sysnames.h # file is needed by param.h to create unique identifiers for each SYS_TYPE. -install: config \ - $(DESTDIR)/bin \ - $(DESTDIR)/bin/mkvers \ - hinstall \ - ukinstall \ - kinstall - -hinstall: \ - $(HDIRS) \ - ${DESTDIR}/include/afs/param.h \ - ${DESTDIR}/include/afs/stds.h \ - ${DESTDIR}/include/afs/afs_sysnames.h \ - ${DESTDIR}/include/afs/afs_args.h \ - ${DESTDIR}/include/afs/icl.h \ - ${DESTDIR}/include/afs/venus.h \ - ${DESTDIR}/include/afs/debug.h +install: ${DESTDIR}${includedir}/afs/param.h \ + ${DESTDIR}${includedir}/afs/stds.h \ + ${DESTDIR}${includedir}/afs/afs_sysnames.h \ + ${DESTDIR}${includedir}/afs/afs_args.h \ + ${DESTDIR}${includedir}/afs/icl.h \ + ${DESTDIR}${includedir}/afs/venus.h \ + ${DESTDIR}${includedir}/afs/debug.h kinstall: \ $(KDIRS) \ @@ -154,4 +155,13 @@ ukinstall: \ ${UKERNELDIR}/afs/AFS_component_version_number.c clean: - $(RM) -f *.o config core xprt AFS_component_version_number.c + $(RM) -f *.o config mkvers core xprt AFS_component_version_number.c + +dest: ${DEST}/include/afs/param.h \ + ${DEST}/include/afs/stds.h \ + ${DEST}/include/afs/afs_sysnames.h \ + ${DEST}/include/afs/afs_args.h \ + ${DEST}/include/afs/icl.h \ + ${DEST}/include/afs/venus.h \ + ${DEST}/include/afs/debug.h + diff --git a/src/config/Makefile.ppc_darwin_12.in b/src/config/Makefile.ppc_darwin_12.in index 9ab1472..be76178 100644 --- a/src/config/Makefile.ppc_darwin_12.in +++ b/src/config/Makefile.ppc_darwin_12.in @@ -33,7 +33,7 @@ AR=ar AS=as CC=cc CP=cp -INSTALL=${DESTDIR}/bin/pinstall +INSTALL=${TOP_SRCDIR}/pinstall/pinstall LEX=lex -l LD= ld LORDER = lorder diff --git a/src/config/Makefile.ppc_darwin_13.in b/src/config/Makefile.ppc_darwin_13.in index 9ab1472..be76178 100644 --- a/src/config/Makefile.ppc_darwin_13.in +++ b/src/config/Makefile.ppc_darwin_13.in @@ -33,7 +33,7 @@ AR=ar AS=as CC=cc CP=cp -INSTALL=${DESTDIR}/bin/pinstall +INSTALL=${TOP_SRCDIR}/pinstall/pinstall LEX=lex -l LD= ld LORDER = lorder diff --git a/src/config/Makefile.ppc_linux24.in b/src/config/Makefile.ppc_linux24.in index 415011c..00762dd 100644 --- a/src/config/Makefile.ppc_linux24.in +++ b/src/config/Makefile.ppc_linux24.in @@ -36,7 +36,7 @@ MV=mv RANLIB=ranlib RM=rm -INSTALL=${DESTDIR}/bin/install +INSTALL=${TOP_SRCDIR}/pinstall/pinstall # # Other OS specific requirements # diff --git a/src/config/Makefile.rs_aix42.in b/src/config/Makefile.rs_aix42.in index 68062f7..7974771 100644 --- a/src/config/Makefile.rs_aix42.in +++ b/src/config/Makefile.rs_aix42.in @@ -34,7 +34,7 @@ LEX=lex MV=mv RANLIB=ranlib RM=rm -INSTALL=${DESTDIR}/bin/install +INSTALL=${TOP_SRCDIR}/pinstall/pinstall # # This is the XBSA make flag and pathname to XBSA header files (xbsa.h) XBSA_FLAGS=-Dxbsa diff --git a/src/config/Makefile.s390_linux22.in b/src/config/Makefile.s390_linux22.in index c30e13a..9f7232b 100644 --- a/src/config/Makefile.s390_linux22.in +++ b/src/config/Makefile.s390_linux22.in @@ -40,7 +40,7 @@ MT_CC=gcc MV=mv RANLIB=ranlib RM=rm -INSTALL=${DESTDIR}/bin/install +INSTALL=${TOP_SRCDIR}/pinstall/pinstall # # Other OS specific requirements # diff --git a/src/config/Makefile.s390_linux24.in b/src/config/Makefile.s390_linux24.in index fa33d99..421f621 100644 --- a/src/config/Makefile.s390_linux24.in +++ b/src/config/Makefile.s390_linux24.in @@ -40,7 +40,7 @@ MT_CC=gcc MV=mv RANLIB=ranlib RM=rm -INSTALL=${DESTDIR}/bin/install +INSTALL=${TOP_SRCDIR}/pinstall/pinstall # # Other OS specific requirements # diff --git a/src/config/Makefile.sgi_62.in b/src/config/Makefile.sgi_62.in index 9c61096..8a7d9d6 100644 --- a/src/config/Makefile.sgi_62.in +++ b/src/config/Makefile.sgi_62.in @@ -38,7 +38,9 @@ LEX=lex MV=mv RANLIB=/bin/true RM=rm -INSTALL=${DESTDIR}/bin/install +INSTALL=${TOP_SRCDIR}/pinstall/pinstall # # This is for the vol package -XFS_SIZE_CHECK = $(DESTDIR)root.server/usr/afs/bin/xfs_size_check +XFS_SIZE_CHECK = xfs_size_check +install_XFS_SIZE_CHECK = $(DESTDIR)${afssrvsbindir}/xfs_size_check +dest_XFS_SIZE_CHECK = $(DEST)/root.server/usr/afs/bin/xfs_size_check diff --git a/src/config/Makefile.sgi_63.in b/src/config/Makefile.sgi_63.in index 836ed40..fd33e43 100644 --- a/src/config/Makefile.sgi_63.in +++ b/src/config/Makefile.sgi_63.in @@ -38,4 +38,4 @@ LEX=lex MV=mv RANLIB=/bin/true RM=rm -INSTALL=${DESTDIR}/bin/install +INSTALL=${TOP_SRCDIR}/pinstall/pinstall diff --git a/src/config/Makefile.sgi_64.in b/src/config/Makefile.sgi_64.in index b09e3ef..f8c7514 100644 --- a/src/config/Makefile.sgi_64.in +++ b/src/config/Makefile.sgi_64.in @@ -39,7 +39,9 @@ LEX=lex MV=mv RANLIB=/bin/true RM=rm -INSTALL=${DESTDIR}/bin/install +INSTALL=${TOP_SRCDIR}/pinstall/pinstall # # This is for the vol package -XFS_SIZE_CHECK = $(DESTDIR)root.server/usr/afs/bin/xfs_size_check +XFS_SIZE_CHECK = xfs_size_check +install_XFS_SIZE_CHECK = $(DESTDIR)${afssrvsbindir}/xfs_size_check +dest_XFS_SIZE_CHECK = $(DEST)/root.server/usr/afs/bin/xfs_size_check diff --git a/src/config/Makefile.sgi_65.in b/src/config/Makefile.sgi_65.in index 1f5608f..a0a0c87 100644 --- a/src/config/Makefile.sgi_65.in +++ b/src/config/Makefile.sgi_65.in @@ -39,7 +39,9 @@ LEX=lex MV=mv RANLIB=/bin/true RM=rm -INSTALL=${DESTDIR}/bin/install +INSTALL=${TOP_SRCDIR}/pinstall/pinstall # # This is for the vol package -XFS_SIZE_CHECK = $(DESTDIR)root.server/usr/afs/bin/xfs_size_check +XFS_SIZE_CHECK = xfs_size_check +install_XFS_SIZE_CHECK = $(DESTDIR)${afssrvsbindir}/xfs_size_check +dest_XFS_SIZE_CHECK = $(DEST)/root.server/usr/afs/bin/xfs_size_check diff --git a/src/config/Makefile.sparc64_linux22.in b/src/config/Makefile.sparc64_linux22.in index 083605d..b550bd7 100644 --- a/src/config/Makefile.sparc64_linux22.in +++ b/src/config/Makefile.sparc64_linux22.in @@ -39,7 +39,7 @@ MT_CC=cc MV=mv RANLIB=ranlib RM=rm -INSTALL=${DESTDIR}/bin/install +INSTALL=${TOP_SRCDIR}/pinstall/pinstall # # Other OS specific requirements # diff --git a/src/config/Makefile.sparc64_linux24.in b/src/config/Makefile.sparc64_linux24.in index 083605d..b550bd7 100644 --- a/src/config/Makefile.sparc64_linux24.in +++ b/src/config/Makefile.sparc64_linux24.in @@ -39,7 +39,7 @@ MT_CC=cc MV=mv RANLIB=ranlib RM=rm -INSTALL=${DESTDIR}/bin/install +INSTALL=${TOP_SRCDIR}/pinstall/pinstall # # Other OS specific requirements # diff --git a/src/config/Makefile.sparc_linux22.in b/src/config/Makefile.sparc_linux22.in index 083605d..b550bd7 100644 --- a/src/config/Makefile.sparc_linux22.in +++ b/src/config/Makefile.sparc_linux22.in @@ -39,7 +39,7 @@ MT_CC=cc MV=mv RANLIB=ranlib RM=rm -INSTALL=${DESTDIR}/bin/install +INSTALL=${TOP_SRCDIR}/pinstall/pinstall # # Other OS specific requirements # diff --git a/src/config/Makefile.sun4x_55.in b/src/config/Makefile.sun4x_55.in index e082e2f..e7bc377 100644 --- a/src/config/Makefile.sun4x_55.in +++ b/src/config/Makefile.sun4x_55.in @@ -39,7 +39,9 @@ MV=mv RANLIB=/bin/true RM=rm STRIP= /usr/ccs/bin/strip -INSTALL=${DESTDIR}/bin/install +INSTALL=${TOP_SRCDIR}/pinstall/pinstall # # this is for the vol package -FS_CONV_SOL26= $(DESTDIR)root.server/usr/afs/bin/fs_conv_sol26 +FS_CONV_SOL26 = fs_conv_sol26 +install_FS_CONV_SOL26 = $(DESTDIR)${afssrvsbindir}/fs_conv_sol26 +dest_FS_CONV_SOL26 = $(DEST)/root.server/usr/afs/bin/fs_conv_sol26 diff --git a/src/config/Makefile.sun4x_56.in b/src/config/Makefile.sun4x_56.in index 59bddda..add1788 100644 --- a/src/config/Makefile.sun4x_56.in +++ b/src/config/Makefile.sun4x_56.in @@ -43,10 +43,12 @@ MV=mv RANLIB=/bin/true RM=rm STRIP= /usr/ccs/bin/strip -INSTALL=${DESTDIR}/bin/install +INSTALL=${TOP_SRCDIR}/pinstall/pinstall # # this is for the vol package -FS_CONV_SOL26= $(DESTDIR)root.server/usr/afs/bin/fs_conv_sol26 +FS_CONV_SOL26 = fs_conv_sol26 +install_FS_CONV_SOL26 = $(DESTDIR)${afssrvsbindir}/fs_conv_sol26 +dest_FS_CONV_SOL26 = $(DEST)/root.server/usr/afs/bin/fs_conv_sol26 # # This is the XBSA make flag and pathname to XBSA header files (xbsa.h) XBSA_FLAGS=-Dxbsa diff --git a/src/config/Makefile.sun4x_57.in b/src/config/Makefile.sun4x_57.in index e4f0579..3f5e0c0 100644 --- a/src/config/Makefile.sun4x_57.in +++ b/src/config/Makefile.sun4x_57.in @@ -47,10 +47,12 @@ MV=mv RANLIB=/bin/true RM=rm STRIP= /usr/ccs/bin/strip -INSTALL=${DESTDIR}/bin/install +INSTALL=${TOP_SRCDIR}/pinstall/pinstall # # this is for the vol package -FS_CONV_SOL26= $(DESTDIR)root.server/usr/afs/bin/fs_conv_sol26 +FS_CONV_SOL26 = fs_conv_sol26 +install_FS_CONV_SOL26 = $(DESTDIR)${afssrvsbindir}/fs_conv_sol26 +dest_FS_CONV_SOL26 = $(DEST)/root.server/usr/afs/bin/fs_conv_sol26 # # This is the XBSA make flag and pathname to XBSA header files (xbsa.h) XBSA_FLAGS=-Dxbsa diff --git a/src/config/Makefile.sun4x_58.in b/src/config/Makefile.sun4x_58.in index 2233890..945a142 100644 --- a/src/config/Makefile.sun4x_58.in +++ b/src/config/Makefile.sun4x_58.in @@ -40,10 +40,12 @@ MV=mv RANLIB=/bin/true RM=rm STRIP= /usr/ccs/bin/strip -INSTALL=${DESTDIR}/bin/install +INSTALL=${TOP_SRCDIR}/pinstall/pinstall # # this is for the vol package -FS_CONV_SOL26= $(DESTDIR)root.server/usr/afs/bin/fs_conv_sol26 +FS_CONV_SOL26 = fs_conv_sol26 +install_FS_CONV_SOL26 = $(DESTDIR)${afssrvsbindir}/fs_conv_sol26 +dest_FS_CONV_SOL26 = $(DEST)/root.server/usr/afs/bin/fs_conv_sol26 # # This is the XBSA make flag and pathname to XBSA header files (xbsa.h) XBSA_FLAGS=-Dxbsa diff --git a/src/config/Makefile.sunx86_54.in b/src/config/Makefile.sunx86_54.in index d0555e8..1c60eca 100644 --- a/src/config/Makefile.sunx86_54.in +++ b/src/config/Makefile.sunx86_54.in @@ -20,4 +20,4 @@ AR = /usr/ccs/bin/ar LD = /usr/ccs/bin/ld LORDER = /usr/ccs/bin/lorder STRIP= /usr/ccs/bin/strip -INSTALL=${DESTDIR}/bin/install +INSTALL=${TOP_SRCDIR}/pinstall/pinstall diff --git a/src/config/Makefile.version-CML b/src/config/Makefile.version-CML index 65b2ae1..0b6cef8 100644 --- a/src/config/Makefile.version-CML +++ b/src/config/Makefile.version-CML @@ -12,14 +12,14 @@ $(VERSFILE).o: $(VERSFILE).c # mkvers checks timestamps $(VERSFILE).c: - $(DESTDIR)bin/mkvers -o $(VERSFILE).c + $(TOP_SRCDIR)/config/mkvers -o $(VERSFILE).c # only done for RX in NT # -c $(CML_PREFIX) $(VERSFILE).h: - $(DESTDIR)bin/mkvers -o $(VERSFILE).h -v + $(TOP_SRCDIR)/config/mkvers -o $(VERSFILE).h -v $(VERSFILE).txt: - $(DESTDIR)bin/mkvers -o $(VERSFILE).txt -t + $(TOP_SRCDIR)/config/mkvers -o $(VERSFILE).txt -t noversion: install diff --git a/src/dauth/Makefile.in b/src/dauth/Makefile.in index 737f4ea..5c6810f 100644 --- a/src/dauth/Makefile.in +++ b/src/dauth/Makefile.in @@ -5,8 +5,21 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -14,33 +27,33 @@ SHELL = /bin/sh include ../config/Makefile.${SYS_NAME} -COMPILE_ET = ${SRCDIR}/bin/compile_et +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et OPTMZ= -g -CFLAGS = ${OPTMZ} -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS} +CFLAGS=${OPTMZ} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} LDFLAGS = ${OPTMZ} ${XLDFLAGS} -INCLS= ${SRCDIR}/include/ubik.h \ - ${SRCDIR}/include/lwp.h \ - ${SRCDIR}/include/lock.h \ - ${SRCDIR}/include/rx/rx.h \ - ${SRCDIR}/include/rx/xdr.h \ - ${SRCDIR}/include/afs/com_err.h +INCLS=${TOP_INCDIR}/ubik.h \ + ${TOP_INCDIR}/lwp.h \ + ${TOP_INCDIR}/lock.h \ + ${TOP_INCDIR}/rx/rx.h \ + ${TOP_INCDIR}/rx/xdr.h \ + ${TOP_INCDIR}/afs/com_err.h VERS = AFS_component_version_number.o OBJS = adkint.cs.o adkint.xdr.o -LIBS = ${SRCDIR}/lib/afs/libkauth.a \ - ${SRCDIR}/lib/afs/libauth.a \ - ${SRCDIR}/lib/afs/libcmd.a \ - ${SRCDIR}/lib/afs/libcom_err.a \ - ${SRCDIR}/lib/libubik.a \ - ${SRCDIR}/lib/librxkad.a \ - ${SRCDIR}/lib/libdes.a \ - ${SRCDIR}/lib/librx.a \ - ${SRCDIR}/lib/liblwp.a \ - ${SRCDIR}/lib/afs/libsys.a \ - ${SRCDIR}/lib/afs/util.a +LIBS=${TOP_LIBDIR}/libkauth.a \ + ${TOP_LIBDIR}/libauth.a \ + ${TOP_LIBDIR}/libcmd.a \ + ${TOP_LIBDIR}/libcom_err.a \ + ${TOP_LIBDIR}/libubik.a \ + ${TOP_LIBDIR}/librxkad.a \ + ${TOP_LIBDIR}/libdes.a \ + ${TOP_LIBDIR}/librx.a \ + ${TOP_LIBDIR}/liblwp.a \ + ${TOP_LIBDIR}/libsys.a \ + ${TOP_LIBDIR}/util.a CELL= `pwd|awk -F/ '{print $$3}'` USNS= cellname @@ -52,7 +65,7 @@ ukinstall webinstall: noversion: install -all: dlog dpass +all: dlog dpass clean: $(RM) -f adkint.h adkint.cs.c adkint.ss.c adkint.xdr.c *.o dlog dpass AFS_component_version_number.c @@ -60,7 +73,7 @@ clean: adkint.cs.o: adkint.cs.c adkint.xdr.o: adkint.xdr.c adkint.h adkint.cs.c adkint.xdr.c adkint.h: adkint.xg - ${SRCDIR}/bin/rxgen adkint.xg + ${RXGEN} adkint.xg dlog: dlog.o $(VERS) $(OBJS) $(LIBS) $(CC) ${LDFLAGS} -o dlog dlog.o $(VERS) $(OBJS) ${LIBS} \ @@ -76,13 +89,19 @@ dlog_test: dlog.c $(OBJS) $(LIBS) $(CC) $(LDFLAGS) -DDLOG_TEST -o dlog_test dlog.c $(OBJS) \ $(LIBS) ${XLIBS} -system: install +${DEST}/bin/dlog: dlog + ${INSTALL} $? $@ + +${DEST}/bin/dpass: dpass + ${INSTALL} $? $@ + -${DESTDIR}/bin/dlog: dlog +install: ${DESTDIR}${bindir}/dlog ${DESTDIR}${bindir}/dpass +${DESTDIR}${bindir}/dlog: dlog ${INSTALL} $? $@ -${DESTDIR}/bin/dpass: dpass +${DESTDIR}${bindir}/dpass: dpass ${INSTALL} $? $@ +dest: ${DEST}/bin/dlog ${DEST}/bin/dpass -install: all ${DESTDIR}/bin/dlog ${DESTDIR}/bin/dpass diff --git a/src/des/Makefile.in b/src/des/Makefile.in index 946d783..6e685cc 100644 --- a/src/des/Makefile.in +++ b/src/des/Makefile.in @@ -22,8 +22,22 @@ # target machine for run-time code (may cross-compile), # override as needed -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -51,13 +65,13 @@ OBJS = \ crypt.o \ util.o -all: install +all: ukinstall ${TOP_LIBDIR}/libdes.a ${TOP_INCDIR}/des.h ${TOP_INCDIR}/des_conf.h ${TOP_INCDIR}/mit-cpyright.h ${TOP_INCDIR}/des_odd.h # # Build rules # .c.o: - ${CC} -c -I. -I${SRCDIR}/include -I${TOP_SRCDIR}/config ${XCFLAGS} $< + ${CC} -c -I. -I${TOP_INCDIR} -I${TOP_SRCDIR}/config ${XCFLAGS} $< libdes.a: ${OBJS} AFS_component_version_number.o $(RM) -f libdes.a @@ -154,26 +168,21 @@ make_e.o: make_e.c ${INCLS} # # Install targets # -install: ukinstall\ - ${DESTDIR}/lib/libdes.a \ - ${DESTDIR}/include/des.h \ - ${DESTDIR}/include/des_conf.h \ - ${DESTDIR}/include/mit-cpyright.h \ - ${DESTDIR}/include/des_odd.h +install: ${DESTDIR}${libdir}/libdes.a ${DESTDIR}${includedir}/des.h ${DESTDIR}${includedir}/des_conf.h ${DESTDIR}${includedir}/mit-cpyright.h ${DESTDIR}${includedir}/des_odd.h -${DESTDIR}/lib/libdes.a: libdes.a +${DEST}/lib/libdes.a: libdes.a ${INSTALL} $? $@ -${DESTDIR}/include/des.h: des.h +${DEST}/include/des.h: des.h ${INSTALL} $? $@ -${DESTDIR}/include/des_conf.h: des_conf.h +${DEST}/include/des_conf.h: des_conf.h ${INSTALL} $? $@ -${DESTDIR}/include/mit-cpyright.h: mit-cpyright.h +${DEST}/include/mit-cpyright.h: mit-cpyright.h ${INSTALL} $? $@ -${DESTDIR}/include/des_odd.h: odd.h +${DEST}/include/des_odd.h: odd.h ${INSTALL} $? $@ ukinstall: \ @@ -208,3 +217,35 @@ clean: include ../config/Makefile.version +${DESTDIR}${libdir}/libdes.a: libdes.a + ${INSTALL} $? $@ + +${TOP_LIBDIR}/libdes.a: libdes.a + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/des.h: des.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/des.h: des.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/des_conf.h: des_conf.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/des_conf.h: des_conf.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/mit-cpyright.h: mit-cpyright.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/mit-cpyright.h: mit-cpyright.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/des_odd.h: odd.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/des_odd.h: odd.h + ${INSTALL} $? $@ + +dest: ${DEST}/lib/libdes.a ${DEST}/include/des.h ${DEST}/include/des_conf.h ${DEST}/include/mit-cpyright.h ${DEST}/include/des_odd.h + diff --git a/src/des/test/Makefile.in b/src/des/test/Makefile.in index 7cd69f4..43cc421 100644 --- a/src/des/test/Makefile.in +++ b/src/des/test/Makefile.in @@ -18,7 +18,7 @@ INCDIRS= -I${TOP_SRCDIR}/config -I${DESTDIR}/include -I.. LIBS=-L.. -ldes CFLAGS = ${INCDIRS} ${XCFLAGS} -all system test: $(PROGS) +all test: $(PROGS) clean: $(RM) -f *.o *.a testit verify key_test core diff --git a/src/dir/Makefile.in b/src/dir/Makefile.in index 8634070..970aef4 100644 --- a/src/dir/Makefile.in +++ b/src/dir/Makefile.in @@ -5,8 +5,22 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -17,17 +31,17 @@ include ../config/Makefile.${SYS_NAME} KERNELDIR = ../libafs/ UKERNELDIR = ../libuafs/ -INCDIRS= -I${TOP_SRCDIR}/config -I${DESTDIR}/include ${XINCLS} +INCDIRS=-I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XINCLS} CFLAGS = ${OPTMZ} ${INCDIRS} ${XCFLAGS} OBJS=buffer.o dir.o salvage.o include ../config/Makefile.version -system noversion: install +noversion: install cmdall: all test -all: libdir.a +all: kinstall ukinstall ${TOP_LIBDIR}/libdir.a ${TOP_INCDIR}/afs/dir.h libdir.a: ${OBJS} AFS_component_version_number.o $(RM) -f libdir.a @@ -45,9 +59,7 @@ ukinstall webinstall: ${UKERNELDIR}/afs ${UKERNELDIR}/afs: mkdir -p $@ -install: all kinstall ukinstall - ${INSTALL} libdir.a ${DESTDIR}/lib/afs - ${INSTALL} dir.h ${DESTDIR}/include/afs +install: ${DESTDIR}${libdir}/afs/libdir.a ${DESTDIR}${includedir}/afs/dir.h test: (cd test; $(MAKE) ) @@ -60,3 +72,27 @@ salvage.o: salvage.c dir.h clean: $(RM) -f *.o *.a core AFS_component_version_number.c +${DEST}/lib/afs/libdir.a: libdir.a + ${INSTALL} $? $@ + +${DESTDIR}${libdir}/afs/libdir.a: libdir.a + ${INSTALL} $? $@ + + +${TOP_LIBDIR}/libdir.a: libdir.a + ${INSTALL} $? $@ + + +${DEST}/include/afs/dir.h: dir.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/dir.h: dir.h + ${INSTALL} $? $@ + + +${TOP_INCDIR}/afs/dir.h: dir.h + ${INSTALL} $? $@ + + +dest: ${DEST}/lib/afs/libdir.a ${DEST}/include/afs/dir.h + diff --git a/src/dir/test/Makefile.in b/src/dir/test/Makefile.in index 0959eec..5fb3498 100644 --- a/src/dir/test/Makefile.in +++ b/src/dir/test/Makefile.in @@ -23,6 +23,8 @@ CFLAGS = ${OPTMZ} ${INCDIRS} ${XCFLAGS} OBJS=test-salvage.o physio.o dtest.o +all: + install: dtest clean: diff --git a/src/export/Makefile.in b/src/export/Makefile.in index 7833450..572d226 100644 --- a/src/export/Makefile.in +++ b/src/export/Makefile.in @@ -9,8 +9,22 @@ # # Makefile for EXPORT kernel extension, and friends # -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -20,7 +34,7 @@ include ../config/Makefile.${SYS_NAME} KERNELDIR = ../libafs/ UKERNELDIR = ../libuafs/ DEFS = - INCS = -I${TOP_SRCDIR}/config -I${SRCDIR}/include + INCS = -I${TOP_SRCDIR}/config -I${TOP_INCDIR} CFLAGS = ${OPTMZ} ${DEFS} ${INCS} EXPORTS = -bexport:export.exp IMPORTS = /lib/kernex.exp /lib/syscalls.exp extras.exp @@ -28,23 +42,15 @@ UKERNELDIR = ../libuafs/ include ../config/Makefile.version -all: export.ext export.ext.nonfs cfgexport cfgafs +all: kinstall ukinstall ${TOP_LIBDIR}/export.exp ${TOP_LIBDIR}/extras.exp cfgexport cfgafs noversion system: install -install: all kinstall ukinstall - ${INSTALL} export.ext ${DESTDIR}/root.client/usr/vice/etc/dkload - ${INSTALL} export.ext.nonfs ${DESTDIR}/root.client/usr/vice/etc/dkload - ${INSTALL} export.exp ${DESTDIR}/lib/afs/export.exp - ${INSTALL} extras.exp ${DESTDIR}/lib/afs/extras.exp - ${INSTALL} cfgexport ${DESTDIR}/root.client/usr/vice/etc/dkload/cfgexport - ${INSTALL} cfgafs ${DESTDIR}/root.client/usr/vice/etc/dkload/cfgafs +install: ${DESTDIR}${libdir}/afs/export.exp ${DESTDIR}${libdir}/afs/extras.exp kinstall: - ${INSTALL} export.h ${DESTDIR}/include - ${INSTALL} export.h ../libafs - ${INSTALL} export.exp ${DESTDIR}/lib - ${INSTALL} export.exp ../libafs + ${INSTALL} export.h ${KERNELDIR} + ${INSTALL} export.exp ${KERNELDIR} ukinstall webinstall: ${INSTALL} export.h ${UKERNELDIR} @@ -71,3 +77,38 @@ cfgafs.o: cfgafs.c AFS_component_version_number.c clean: $(RM) -f *.o *.Zlst *.map *.out cfgexport cfgafs *.ext AFS_component_version_number.c +${DEST}/root.client/usr/vice/etc/dkload/export.ext: export.ext + ${INSTALL} $? $@ + +${DEST}/root.client/usr/vice/etc/dkload/export.ext.nonfs: export.ext.nonfs + ${INSTALL} $? $@ + +${DEST}/lib/afs/export.exp: export.exp + ${INSTALL} $? $@ + +${DESTDIR}${libdir}/afs/export.exp: export.exp + ${INSTALL} $? $@ + + +${TOP_LIBDIR}/export.exp: export.exp + ${INSTALL} $? $@ + + +${DEST}/lib/afs/extras.exp: extras.exp + ${INSTALL} $? $@ + +${DESTDIR}${libdir}/afs/extras.exp: extras.exp + ${INSTALL} $? $@ + + +${TOP_LIBDIR}/extras.exp: extras.exp + ${INSTALL} $? $@ + + +${DEST}/root.client/usr/vice/etc/dkload/cfgexport: cfgexport + ${INSTALL} $? $@ + +${DEST}/root.client/usr/vice/etc/dkload/cfgafs: cfgafs + ${INSTALL} $? $@ + +dest: ${DEST}/root.client/usr/vice/etc/dkload/export.ext ${DEST}/root.client/usr/vice/etc/dkload/export.ext.nonfs ${DEST}/lib/afs/export.exp ${DEST}/lib/afs/extras.exp ${DEST}/root.client/usr/vice/etc/dkload/cfgexport ${DEST}/root.client/usr/vice/etc/dkload/cfgafs diff --git a/src/finale/Makefile.in b/src/finale/Makefile.in index 3d4d610..eb1f0e1 100644 --- a/src/finale/Makefile.in +++ b/src/finale/Makefile.in @@ -5,49 +5,63 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ SHELL = /bin/sh include ../config/Makefile.${SYS_NAME} -CFLAGS = -g -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS} +CFLAGS=-g -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} LDFLAGS = -g ${XLDFLAGS} -INCLS=${SRCDIR}/include/ubik.h \ - ${SRCDIR}/include/lwp.h \ - ${SRCDIR}/include/lock.h \ - ${SRCDIR}/include/rx/rx.h \ - ${SRCDIR}/include/rx/xdr.h \ - ${SRCDIR}/include/rx/rxkad.h \ - ${SRCDIR}/include/afs/com_err.h \ - ${SRCDIR}/include/afs/auth.h \ - ${SRCDIR}/include/afs/cellconfig.h \ - ${SRCDIR}/include/afs/cmd.h \ - ${SRCDIR}/include/afs/pterror.h \ - ${SRCDIR}/include/afs/kautils.h \ - ${SRCDIR}/include/afs/bnode.h \ - ${SRCDIR}/include/afs/vlserver.h - -LIBS=${SRCDIR}/lib/libubik.a \ - ${SRCDIR}/lib/librx.a \ - ${SRCDIR}/lib/liblwp.a \ - ${SRCDIR}/lib/afs/libauth.a \ - ${SRCDIR}/lib/afs/libsys.a \ - ${SRCDIR}/lib/librxkad.a \ - ${SRCDIR}/lib/afs/libcmd.a \ - ${SRCDIR}/lib/afs/libvldb.a \ - ${SRCDIR}/lib/afs/libbos.a \ - ${SRCDIR}/lib/afs/libcom_err.a \ - ${SRCDIR}/lib/afs/libvolser.a \ - ${SRCDIR}/lib/afs/util.a \ - ${SRCDIR}/lib/afs/libkauth.a \ - ${SRCDIR}/lib/afs/libprot.a \ - ${SRCDIR}/lib/libdes.a \ +INCLS=${TOP_INCDIR}/ubik.h \ + ${TOP_INCDIR}/lwp.h \ + ${TOP_INCDIR}/lock.h \ + ${TOP_INCDIR}/rx/rx.h \ + ${TOP_INCDIR}/rx/xdr.h \ + ${TOP_INCDIR}/rx/rxkad.h \ + ${TOP_INCDIR}/afs/com_err.h \ + ${TOP_INCDIR}/afs/auth.h \ + ${TOP_INCDIR}/afs/cellconfig.h \ + ${TOP_INCDIR}/afs/cmd.h \ + ${TOP_INCDIR}/afs/pterror.h \ + ${TOP_INCDIR}/afs/kautils.h \ + ${TOP_INCDIR}/afs/bnode.h \ + ${TOP_INCDIR}/afs/vlserver.h + +LIBS=${TOP_LIBDIR}/libubik.a \ + ${TOP_LIBDIR}/librx.a \ + ${TOP_LIBDIR}/liblwp.a \ + ${TOP_LIBDIR}/libauth.a \ + ${TOP_LIBDIR}/libsys.a \ + ${TOP_LIBDIR}/librxkad.a \ + ${TOP_LIBDIR}/libcmd.a \ + ${TOP_LIBDIR}/libvldb.a \ + ${TOP_LIBDIR}/libbos.a \ + ${TOP_LIBDIR}/libcom_err.a \ + ${TOP_LIBDIR}/libvolser.a \ + ${TOP_LIBDIR}/util.a \ + ${TOP_LIBDIR}/libkauth.a \ + ${TOP_LIBDIR}/libprot.a \ + ${TOP_LIBDIR}/libdes.a \ ${XLIBS} -all: install +all: translate_et translate_et: translate_et.o ${INCLS} ${CC} ${LDFLAGS} -o translate_et translate_et.o ${LIBS} @@ -71,9 +85,9 @@ test: translate_et # # Install targets # -install: ${DESTDIR}/bin/translate_et +install: ${DESTDIR}${bindir}/translate_et -${DESTDIR}/bin/translate_et: translate_et +${DEST}/bin/translate_et: translate_et ${INSTALL} $? $@ # @@ -85,3 +99,8 @@ clean: include ../config/Makefile.version +${DESTDIR}${bindir}/translate_et: translate_et + ${INSTALL} $? $@ + +dest: ${DEST}/bin/translate_et + diff --git a/src/fsint/Makefile.in b/src/fsint/Makefile.in index de983f8..2869fe1 100644 --- a/src/fsint/Makefile.in +++ b/src/fsint/Makefile.in @@ -5,8 +5,22 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -17,18 +31,18 @@ KERNELDIR = ../libafs/ UKERNELDIR = ../libuafs/ OBJS=afsaux.o afscbint.cs.o afscbint.ss.o afscbint.xdr.o afsint.cs.o afsint.ss.o afsint.xdr.o -CFLAGS=${DBUG} -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS} +CFLAGS=${DBUG} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} KDSRCS=Kcallback.ss.c Kcallback.h Kvice.cs.c Kvice.h Kvice.xdr.c afscbint.h \ afsint.h KSRCS=${KDSRCS} afsaux.c UKSRCS=${KSRCS} -UTILS=$(SRCDIR)/bin/rxgen +UTILS=${RXGEN} include ../config/Makefile.version noversion: install -all: libafsint.a $(KSRCS) +all: kinstall ukinstall ${TOP_LIBDIR}/libafsint.a ${TOP_INCDIR}/afs/afsint.h ${TOP_INCDIR}/afs/afscbint.h libafsint.a: ${OBJS} AFS_component_version_number.o -$(RM) -f $@ @@ -38,58 +52,58 @@ libafsint.a: ${OBJS} AFS_component_version_number.o afsaux.o: afsaux.c afsint.h Kcallback.cs.c: common.xg afscbint.xg Kvice.h Kcallback.h $(UTILS) - ${SRCDIR}/bin/rxgen -x -k -C -o Kcallback.cs.c afscbint.xg + ${RXGEN} -x -k -C -o Kcallback.cs.c afscbint.xg Kcallback.ss.c: common.xg afscbint.xg Kvice.h Kcallback.h $(UTILS) - ${SRCDIR}/bin/rxgen -x -k -S -o Kcallback.ss.c afscbint.xg + ${RXGEN} -x -k -S -o Kcallback.ss.c afscbint.xg Kcallback.xdr.c: common.xg afscbint.xg Kvice.h Kcallback.h $(UTILS) - ${SRCDIR}/bin/rxgen -x -k -y -c -o Kcallback.xdr.c afscbint.xg + ${RXGEN} -x -k -y -c -o Kcallback.xdr.c afscbint.xg Kvice.cs.c: common.xg afsint.xg Kvice.h $(UTILS) - ${SRCDIR}/bin/rxgen -x -k -C -o Kvice.cs.c afsint.xg + ${RXGEN} -x -k -C -o Kvice.cs.c afsint.xg Kvice.ss.c: common.xg afsint.xg Kvice.h $(UTILS) - ${SRCDIR}/bin/rxgen -x -k -S -o Kvice.ss.c afsint.xg + ${RXGEN} -x -k -S -o Kvice.ss.c afsint.xg Kvice.xdr.c: common.xg afsint.xg $(UTILS) - ${SRCDIR}/bin/rxgen -x -k -c -o Kvice.xdr.c afsint.xg + ${RXGEN} -x -k -c -o Kvice.xdr.c afsint.xg Kvice.h: common.xg afsint.xg $(UTILS) - ${SRCDIR}/bin/rxgen -x -k -h -o Kvice.h afsint.xg + ${RXGEN} -x -k -h -o Kvice.h afsint.xg Kcallback.h: common.xg afscbint.xg $(UTILS) - ${SRCDIR}/bin/rxgen -x -k -h -o Kcallback.h afscbint.xg + ${RXGEN} -x -k -h -o Kcallback.h afscbint.xg afscbint.cs.c: common.xg afscbint.xg afsint.h afscbint.h $(UTILS) - ${SRCDIR}/bin/rxgen -x -C -o afscbint.cs.c afscbint.xg + ${RXGEN} -x -C -o afscbint.cs.c afscbint.xg afscbint.ss.c: common.xg afscbint.xg afsint.h afscbint.h $(UTILS) - ${SRCDIR}/bin/rxgen -x -S -o afscbint.ss.c afscbint.xg + ${RXGEN} -x -S -o afscbint.ss.c afscbint.xg afscbint.xdr.c: common.xg afscbint.xg afsint.h afscbint.h $(UTILS) - ${SRCDIR}/bin/rxgen -x -y -c -o afscbint.xdr.c afscbint.xg + ${RXGEN} -x -y -c -o afscbint.xdr.c afscbint.xg afsint.cs.c: common.xg afsint.xg afsint.h $(UTILS) - ${SRCDIR}/bin/rxgen -x -C -o afsint.cs.c afsint.xg + ${RXGEN} -x -C -o afsint.cs.c afsint.xg afsint.ss.c: common.xg afsint.xg afsint.h $(UTILS) - ${SRCDIR}/bin/rxgen -x -S -o afsint.ss.c afsint.xg + ${RXGEN} -x -S -o afsint.ss.c afsint.xg afsint.xdr.c: common.xg afsint.xg $(UTILS) - ${SRCDIR}/bin/rxgen -x -c -o afsint.xdr.c afsint.xg + ${RXGEN} -x -c -o afsint.xdr.c afsint.xg afsint.h: common.xg afsint.xg $(UTILS) - ${SRCDIR}/bin/rxgen -x -h -o afsint.h afsint.xg + ${RXGEN} -x -h -o afsint.h afsint.xg afscbint.h: common.xg afscbint.xg $(UTILS) - ${SRCDIR}/bin/rxgen -x -h -o afscbint.h afscbint.xg + ${RXGEN} -x -h -o afscbint.h afscbint.xg system: install kinstall: ${KSRCS} ${KERNELDIR}/afsint ${INSTALL} $(KSRCS) ${KERNELDIR}/afsint - ${INSTALL} ${SRCDIR}/include/afs/rxgen_consts.h ${KERNELDIR}/afsint + ${INSTALL} ${TOP_INCDIR}/afs/rxgen_consts.h ${KERNELDIR}/afsint -${INSTALL} ${KERNELDIR}/rx/rx.h ${KERNELDIR}/afsint/rx.h ${INSTALL} afscbint.h ${KERNELDIR}/afs @@ -98,17 +112,49 @@ ${KERNELDIR}/afsint: ukinstall webinstall: ${UKERNELDIR}/afsint ${UKSRCS} ${INSTALL} $(UKSRCS) ${UKERNELDIR}/afsint - ${INSTALL} ${SRCDIR}/include/afs/rxgen_consts.h ${UKERNELDIR}/afsint + ${INSTALL} ${TOP_INCDIR}/afs/rxgen_consts.h ${UKERNELDIR}/afsint -${INSTALL} ${UKERNELDIR}/rx/rx.h ${UKERNELDIR}/afsint/rx.h ${INSTALL} afscbint.h ${UKERNELDIR}/afs ${UKERNELDIR}/afsint: mkdir -p $@ -install: all kinstall ukinstall - ${INSTALL} libafsint.a ${DESTDIR}/lib/afs - ${INSTALL} afsint.h ${DESTDIR}/include/afs - ${INSTALL} afscbint.h ${DESTDIR}/include/afs +install: ${DESTDIR}${libdir}/afs/libafsint.a ${DESTDIR}${includedir}/afs/afsint.h ${DESTDIR}${includedir}/afs/afscbint.h clean: $(RM) -f *.o *.cs.c *.ss.c *.er.c afsint.h afsint.xdr.c libafsint.a $(KDSRCS) core AFS_component_version_number.c afscbint.xdr.c +${DEST}/lib/afs/libafsint.a: libafsint.a + ${INSTALL} $? $@ + +${DESTDIR}${libdir}/afs/libafsint.a: libafsint.a + ${INSTALL} $? $@ + + +${TOP_LIBDIR}/libafsint.a: libafsint.a + ${INSTALL} $? $@ + + +${DEST}/include/afs/afsint.h: afsint.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/afsint.h: afsint.h + ${INSTALL} $? $@ + + +${TOP_INCDIR}/afs/afsint.h: afsint.h + ${INSTALL} $? $@ + + +${DEST}/include/afs/afscbint.h: afscbint.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/afscbint.h: afscbint.h + ${INSTALL} $? $@ + + +${TOP_INCDIR}/afs/afscbint.h: afscbint.h + ${INSTALL} $? $@ + + +dest: ${DEST}/lib/afs/libafsint.a ${DEST}/include/afs/afsint.h ${DEST}/include/afs/afscbint.h + diff --git a/src/fsprobe/Makefile.in b/src/fsprobe/Makefile.in index 6aade25..802f68a 100644 --- a/src/fsprobe/Makefile.in +++ b/src/fsprobe/Makefile.in @@ -8,8 +8,22 @@ # Makefile for fsprobe and its test program, all part of the AFS # navigation and monitoring tool (gator). # -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -19,29 +33,29 @@ include ../config/Makefile.${SYS_NAME} CFLAGS=-g -I. \ -I${TOP_SRCDIR}/config \ - -I${SRCDIR}/include \ - -I${SRCDIR}/include/afs \ + -I${TOP_INCDIR} \ + -I${TOP_INCDIR}/afs \ -I${SRCDIR} \ -I/usr/include ${XCFLAGS} -RPCINCLS=${SRCDIR}/include/lwp.h ${SRCDIR}/include/rx/rx.h +RPCINCLS=${TOP_INCDIR}/lwp.h ${TOP_INCDIR}/rx/rx.h INCLS=fsprobe.h ${RPCINCLS} -LIBS= ${SRCDIR}/lib/afs/libvolser.a ${SRCDIR}/lib/afs/vlib.a ${SRCDIR}/lib/afs/libacl.a \ - ${SRCDIR}/lib/afs/libsys.a ${SRCDIR}/lib/afs/libvldb.a \ - ${SRCDIR}/lib/libubik.a \ - ${SRCDIR}/lib/afs/libauth.a ${SRCDIR}/lib/afs/libsys.a \ - ${SRCDIR}/lib/afs/libcmd.a ${SRCDIR}/lib/librxkad.a ${SRCDIR}/lib/libdes.a \ - ${SRCDIR}/lib/afs/libcom_err.a ${SRCDIR}/lib/afs/libkauth.a \ - ${SRCDIR}/lib/afs/libaudit.a \ - ${SRCDIR}/lib/afs/libafsint.a \ - ${SRCDIR}/lib/librx.a \ - ${SRCDIR}/lib/liblwp.a \ - ${SRCDIR}/lib/afs/libsys.a \ - ${SRCDIR}/lib/afs/util.a - -all: install +LIBS=${TOP_LIBDIR}/libvolser.a ${TOP_LIBDIR}/vlib.a ${TOP_LIBDIR}/libacl.a \ + ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/libvldb.a \ + ${TOP_LIBDIR}/libubik.a \ + ${TOP_LIBDIR}/libauth.a ${TOP_LIBDIR}/libsys.a \ + ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/librxkad.a ${TOP_LIBDIR}/libdes.a \ + ${TOP_LIBDIR}/libcom_err.a ${TOP_LIBDIR}/libkauth.a \ + ${TOP_LIBDIR}/libaudit.a \ + ${TOP_LIBDIR}/libafsint.a \ + ${TOP_LIBDIR}/librx.a \ + ${TOP_LIBDIR}/liblwp.a \ + ${TOP_LIBDIR}/libsys.a \ + ${TOP_LIBDIR}/util.a + +all: ${TOP_INCDIR}/afs/fsprobe.h ${TOP_LIBDIR}/libfsprobe.a fsprobe_test # # Build targets @@ -62,14 +76,12 @@ fsprobe_test: fsprobe_test.o libfsprobe.a ${LIBS} # # Install targets # -install: ${DESTDIR}/include/afs/fsprobe.h \ - ${DESTDIR}/lib/afs/libfsprobe.a \ - fsprobe_test +install: ${DESTDIR}${includedir}/afs/fsprobe.h ${DESTDIR}${libdir}/afs/libfsprobe.a -${DESTDIR}/include/afs/fsprobe.h: fsprobe.h +${DEST}/include/afs/fsprobe.h: fsprobe.h ${INSTALL} $? $@ -${DESTDIR}/lib/afs/libfsprobe.a: libfsprobe.a +${DEST}/lib/afs/libfsprobe.a: libfsprobe.a ${INSTALL} $? $@ # @@ -80,3 +92,17 @@ clean: include ../config/Makefile.version +${DESTDIR}${includedir}/afs/fsprobe.h: fsprobe.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/fsprobe.h: fsprobe.h + ${INSTALL} $? $@ + +${DESTDIR}${libdir}/afs/libfsprobe.a: libfsprobe.a + ${INSTALL} $? $@ + +${TOP_LIBDIR}/libfsprobe.a: libfsprobe.a + ${INSTALL} $? $@ + +dest: ${DEST}/include/afs/fsprobe.h ${DEST}/lib/afs/libfsprobe.a + diff --git a/src/ftpd43+/Makefile.in b/src/ftpd43+/Makefile.in index b380761..72ee15a 100644 --- a/src/ftpd43+/Makefile.in +++ b/src/ftpd43+/Makefile.in @@ -16,8 +16,22 @@ # # @(#)Makefile 5.8 (Berkeley) 9/22/88 -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -25,15 +39,14 @@ SYS_NAME=@AFS_SYSNAME@ include ../config/Makefile.version include ../config/Makefile.${SYS_NAME} -LIBDIR = ${DESTDIR}/lib/ -AFSLIBS = ${LIBDIR}/afs/libkauth.a ${LIBDIR}/afs/libprot.a ${LIBDIR}/libubik.a \ - ${LIBDIR}/afs/libauth.a ${DESTDIR}/lib/librxkad.a ${LIBDIR}/afs/libsys.a \ - ${DESTDIR}/lib/libdes.a ${LIBDIR}/librx.a ${LIBDIR}/liblwp.a \ - ${LIBDIR}/afs/libcmd.a ${LIBDIR}/afs/libcom_err.a ${LIBDIR}/afs/util.a \ - ${LIBDIR}/afs/libaudit.a +AFSLIBS=${TOP_LIBDIR}/libkauth.a ${TOP_LIBDIR}/libprot.a ${TOP_LIBDIR}/libubik.a \ + ${TOP_LIBDIR}/libauth.a ${TOP_LIBDIR}/librxkad.a ${TOP_LIBDIR}/libsys.a \ + ${TOP_LIBDIR}/libdes.a ${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/liblwp.a \ + ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/libcom_err.a ${TOP_LIBDIR}/util.a \ + ${TOP_LIBDIR}/libaudit.a LIBS = ${AFSLIBS} -CFLAGS= ${OPTMZ} -I${DESTDIR}/include ${XCFLAGS} +CFLAGS=${OPTMZ} -I${TOP_INCDIR} ${XCFLAGS} LIBC= /lib/libc.a SRCS= ftpd.c ftpcmd.c getusershell.c glob.c logwtmp.c popen.c vers.c OBJS= ftpd.o ftpcmd.o getusershell.o glob.o logwtmp.o popen.o vers.o @@ -42,9 +55,7 @@ MAN= ftpd.8 noversion: install -all: ftpd - -system: install +all: ${MAN} ftpd: ${OBJS} ${LIBS} case ${SYS_NAME} in \ @@ -58,8 +69,8 @@ ftpd: ${OBJS} ${LIBS} ftpd.o: ftpd.c AFS_component_version_number.c vers.o: ftpd.c ftpcmd.y -# sh newvers.sh ${CC} ${CFLAGS} -c vers.c +# sh newvers.sh clean: $(RM) -f ${OBJS} ftpd core ftpcmd.c AFS_component_version_number.c @@ -70,5 +81,14 @@ cleandir: clean depend: ${SRCS} mkdep ${CFLAGS} ${SRCS} -install: ${MAN} all - ${INSTALL} -s -m 755 ftpd ${DESTDIR}/etc/ftpd +install: ${DESTDIR}${sbindir}/ftpd + +${DEST}/etc/ftpd: ftpd + ${INSTALL} $? $@ + +${DESTDIR}${sbindir}/ftpd: ftpd + ${INSTALL} $? $@ + + +dest: ${DEST}/etc/ftpd + diff --git a/src/gtx/Makefile.in b/src/gtx/Makefile.in index 7a680ad..956ed6d 100644 --- a/src/gtx/Makefile.in +++ b/src/gtx/Makefile.in @@ -7,8 +7,21 @@ # Makefile for gtx, a display-independent, object-oriented window toolkit. -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -16,9 +29,9 @@ SHELL=/bin/sh include ../config/Makefile.${SYS_NAME} -COMPILE_ET=${SRCDIR}/bin/compile_et -CFLAGS= ${DBUG} -I. -I${TOP_SRCDIR}/config \ - -I${SRCDIR}/include -I${SRCDIR}/include/afs ${XCFLAGS} +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +CFLAGS=${DBUG} -I. -I${TOP_SRCDIR}/config \ + -I${TOP_INCDIR} -I${TOP_INCDIR}/afs ${XCFLAGS} LDFLAGS = ${XLDFLAGS} #RPCINCLS=${SRCDIR}/include/lwp.h ${SRCDIR}/include/rx/rx.h bosint.h RPCINCLS= @@ -35,23 +48,23 @@ INCLS=gtxobjects.h \ gtxframe.h \ gtxobjdict.h \ ${RPCINCLS} \ - ${SRCDIR}/include/afs/keys.h \ - ${SRCDIR}/include/afs/cellconfig.h \ - ${SRCDIR}/include/afs/cmd.h - -LIBS= \ - ${SRCDIR}/lib/librx.a \ - ${SRCDIR}/lib/liblwp.a \ - ${SRCDIR}/lib/afs/libsys.a \ - ${SRCDIR}/lib/afs/libcmd.a \ - ${SRCDIR}/lib/afs/libkauth.a \ - ${SRCDIR}/lib/afs/libauth.a \ - ${SRCDIR}/lib/librxkad.a \ - ${SRCDIR}/lib/libdes.a \ - ${SRCDIR}/lib/afs/libcom_err.a \ - ${SRCDIR}/lib/afs/util.a - -EXTRA_LIBS= ${TXLIBS} ${SRCDIR}/lib/afs/libtermlib.a ${XLIBS} + ${TOP_INCDIR}/afs/keys.h \ + ${TOP_INCDIR}/afs/cellconfig.h \ + ${TOP_INCDIR}/afs/cmd.h + +LIBS=\ + ${TOP_LIBDIR}/librx.a \ + ${TOP_LIBDIR}/liblwp.a \ + ${TOP_LIBDIR}/libsys.a \ + ${TOP_LIBDIR}/libcmd.a \ + ${TOP_LIBDIR}/libkauth.a \ + ${TOP_LIBDIR}/libauth.a \ + ${TOP_LIBDIR}/librxkad.a \ + ${TOP_LIBDIR}/libdes.a \ + ${TOP_LIBDIR}/libcom_err.a \ + ${TOP_LIBDIR}/util.a + +EXTRA_LIBS=${TXLIBS} ${TOP_LIBDIR}/libtermlib.a ${XLIBS} KEYMAP_SRCS=keymap.c input.c frame.c @@ -90,6 +103,8 @@ include ../config/Makefile.version noversion: install all: libgtx.a gtxtest + ${INSTALL} gtx*.h ${TOP_INCDIR}/afs + ${INSTALL} libgtx.a ${TOP_LIBDIR} tests: object_test screen_test curses_test cb_test gtxtest @@ -156,16 +171,19 @@ object_test: object_test.o ${WINDOW_OBJS} ${DICT_OBJS} ${OBJECT_OBJS} ${CB_OBJS} # # Misc others # -system: install - libgtx.a: ${LIBOBJS} AFS_component_version_number.o -$(RM) -f $@ ar rv $@ ${LIBOBJS} AFS_component_version_number.o ${RANLIB} $@ -install: all - ${INSTALL} gtx*.h ${DESTDIR}/include/afs - ${INSTALL} libgtx.a ${DESTDIR}/lib/afs +install: libgtx.a + ${INSTALL} gtx*.h ${DESTDIR}${includedir}/afs + ${INSTALL} libgtx.a ${DESTDIR}${libdir}/afs clean: $(RM) -f *.o *.a *.ln object_test screen_test curses_test err.c core cb_test gtxtest AFS_component_version_number.c + +dest: libgtx.a + ${INSTALL} gtx*.h ${DEST}/include/afs + ${INSTALL} libgtx.a ${DEST}/lib/afs + diff --git a/src/inetd/Makefile.in b/src/inetd/Makefile.in index 98fad88..b1d3f96 100644 --- a/src/inetd/Makefile.in +++ b/src/inetd/Makefile.in @@ -1,6 +1,18 @@ -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -8,16 +20,15 @@ SHELL=/bin/sh include ../config/Makefile.${SYS_NAME} -INCLUDES = -I${TOP_SRCDIR}/config -I${DESTDIR}/include +INCLUDES = -I${TOP_SRCDIR}/config -I${TOP_INCDIR} DEFINES = ${INCLUDES} -LIBDIR = ${DESTDIR}/lib/ -AFSLIBS = ${LIBDIR}/afs/libkauth.a ${LIBDIR}/libubik.a\ - ${LIBDIR}/afs/libauth.a ${LIBDIR}/afs/libsys.a \ - ${LIBDIR}/librx.a \ - ${LIBDIR}/afs/libsys.a \ - ${LIBDIR}/liblwp.a ${DESTDIR}/lib/librxkad.a\ - ${DESTDIR}/lib/libdes.a ${LIBDIR}/afs/libcmd.a \ - ${LIBDIR}/afs/libcom_err.a ${LIBDIR}/afs/util.a +AFSLIBS = ${TOP_LIBDIR}/libkauth.a ${TOP_LIBDIR}/libubik.a\ + ${TOP_LIBDIR}/libauth.a ${TOP_LIBDIR}/libsys.a \ + ${TOP_LIBDIR}/librx.a \ + ${TOP_LIBDIR}/libsys.a \ + ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/librxkad.a\ + ${TOP_LIBDIR}/libdes.a ${TOP_LIBDIR}/libcmd.a \ + ${TOP_LIBDIR}/libcom_err.a ${TOP_LIBDIR}/util.a LIBRES = LIBS = ${AFSLIBS} ${LIBRES} ${XLIBS} OBJS = inetd.o setenv.o getenv.o @@ -30,8 +41,6 @@ noversion: install # ta-rauth.o is used by rlogin, rsh, rcp, rlogind all : inetd ta-rauth.o -system: install - inetd: ${OBJS} set -x; \ case "${SYS_NAME}" in \ @@ -49,16 +58,23 @@ ta-rauth.o: ta-rauth.c clean: $(RM) -f inetd *.o *.BAK *~ core AFS_component_version_number.c -install: all - ${INSTALL} -s -m 755 inetd ${DESTDIR}/etc/inetd +install: ${DESTDIR}${sbindir}/inetd + +dest: ${DEST}/etc/inetd set -x; \ case "${SYS_NAME}" in \ sun4* ) \ - ${INSTALL} -m 644 -f inetd.conf.solaris ${DESTDIR}/etc/inetd.conf ;; \ + ${INSTALL} -m 644 -f inetd.conf.solaris ${DEST}/etc/inetd.conf ;; \ sgi_* ) \ - ${INSTALL} -m 644 -f inetd.conf.sgi ${DESTDIR}/etc/inetd.conf ;; \ + ${INSTALL} -m 644 -f inetd.conf.sgi ${DEST}/etc/inetd.conf ;; \ alpha_dux?? ) \ - ${INSTALL} -m 644 -f inetd.conf.dux40 ${DESTDIR}/etc/inetd.conf ;; \ + ${INSTALL} -m 644 -f inetd.conf.dux40 ${DEST}/etc/inetd.conf ;; \ * ) \ - ${INSTALL} -m 644 inetd.conf ${DESTDIR}/etc/inetd.conf ;; \ + ${INSTALL} -m 644 inetd.conf ${DEST}/etc/inetd.conf ;; \ esac + +${DESTDIR}${sbindir}/inetd: inetd + ${INSTALL} $? $@ + +${DEST}/etc/inetd: inetd + ${INSTALL} $? $@ diff --git a/src/kauth/Makefile.in b/src/kauth/Makefile.in index 2758845..d8d9548 100644 --- a/src/kauth/Makefile.in +++ b/src/kauth/Makefile.in @@ -5,9 +5,21 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -# */ -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -16,49 +28,49 @@ SHELL = /bin/sh include ../config/Makefile.${SYS_NAME} UKERNELDIR = ../libuafs/ -COMPILE_ET = ${SRCDIR}/bin/compile_et +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et -CFLAGS = ${OPTMZ} -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS} +CFLAGS=${OPTMZ} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} LDFLAGS = ${OPTMZ} ${XLDFLAGS} -INCLS=${SRCDIR}/include/ubik.h \ - ${SRCDIR}/include/lwp.h \ - ${SRCDIR}/include/lock.h \ - ${SRCDIR}/include/rx/rx.h \ - ${SRCDIR}/include/rx/xdr.h \ - ${SRCDIR}/include/rx/rxkad.h \ - ${SRCDIR}/include/afs/com_err.h \ - kaserver.h kauth.h kautils.h - -LIBS = ${SRCDIR}/lib/libubik.a \ - ${SRCDIR}/lib/afs/libprot.a \ - ${SRCDIR}/lib/afs/libauth.a \ - ${SRCDIR}/lib/librxkad.a \ - ${SRCDIR}/lib/afs/libsys.a \ - ${SRCDIR}/lib/librxstat.a \ - ${SRCDIR}/lib/librx.a \ - ${SRCDIR}/lib/afs/libsys.a \ - ${SRCDIR}/lib/liblwp.a \ - ${SRCDIR}/lib/libdes.a \ - ${SRCDIR}/lib/afs/libcmd.a \ - ${SRCDIR}/lib/afs/libcom_err.a \ - ${SRCDIR}/lib/afs/util.a \ +INCLS=${TOP_INCDIR}/ubik.h \ + ${TOP_INCDIR}/lwp.h \ + ${TOP_INCDIR}/lock.h \ + ${TOP_INCDIR}/rx/rx.h \ + ${TOP_INCDIR}/rx/xdr.h \ + ${TOP_INCDIR}/rx/rxkad.h \ + ${TOP_INCDIR}/afs/com_err.h \ + kaserver.h kauth.h kautils.h + +LIBS=${TOP_LIBDIR}/libubik.a \ + ${TOP_LIBDIR}/libprot.a \ + ${TOP_LIBDIR}/libauth.a \ + ${TOP_LIBDIR}/librxkad.a \ + ${TOP_LIBDIR}/libsys.a \ + ${TOP_LIBDIR}/librxstat.a \ + ${TOP_LIBDIR}/librx.a \ + ${TOP_LIBDIR}/libsys.a \ + ${TOP_LIBDIR}/liblwp.a \ + ${TOP_LIBDIR}/libdes.a \ + ${TOP_LIBDIR}/libcmd.a \ + ${TOP_LIBDIR}/libcom_err.a \ + ${TOP_LIBDIR}/util.a \ $(DBM) UKSRCS=authclient.c user.c kautils.h kaserver.h kaaux.c token.c \ kalocalcell.c client.c kaerrors.c -KLIBS = ${SRCDIR}/lib/libubik.a \ - ${SRCDIR}/lib/afs/libprot.a \ - ${SRCDIR}/lib/afs/libauth.krb.a \ - ${SRCDIR}/lib/librxkad.a \ - ${SRCDIR}/lib/afs/libsys.a \ - ${SRCDIR}/lib/librx.a \ - ${SRCDIR}/lib/afs/libsys.a \ - ${SRCDIR}/lib/liblwp.a \ - ${SRCDIR}/lib/libdes.a \ - ${SRCDIR}/lib/afs/libcmd.a \ - ${SRCDIR}/lib/afs/libcom_err.a \ - ${SRCDIR}/lib/afs/util.a +KLIBS=${TOP_LIBDIR}/libubik.a \ + ${TOP_LIBDIR}/libprot.a \ + ${TOP_LIBDIR}/libauth.krb.a \ + ${TOP_LIBDIR}/librxkad.a \ + ${TOP_LIBDIR}/libsys.a \ + ${TOP_LIBDIR}/librx.a \ + ${TOP_LIBDIR}/libsys.a \ + ${TOP_LIBDIR}/liblwp.a \ + ${TOP_LIBDIR}/libdes.a \ + ${TOP_LIBDIR}/libcmd.a \ + ${TOP_LIBDIR}/libcom_err.a \ + ${TOP_LIBDIR}/util.a OBJS=kauth.xdr.o kauth.cs.o kaaux.o client.o authclient.o token.o kautils.o kalocalcell.o kaerrors.o user.o krb_tf.o KOBJS=kauth.xdr.o kauth.cs.o kaaux.o client.o authclient.o token.o kautils.o kalocalcell.o kaerrors.o user.krb.o krb_tf.o @@ -67,16 +79,16 @@ include ../config/Makefile.version noversion: install -all: knfs kaserver kas klog klog.krb kpasswd klogin klogin.krb rebuild kdb kpwvalid +all: ukinstall kaserver kas kpwvalid klog klog.krb knfs kpasswd ${TOP_LIBDIR}/libkauth.a ${TOP_LIBDIR}/libkauth.krb.a rebuild kdb ${TOP_INCDIR}/afs/kautils.h ${TOP_INCDIR}/afs/kauth.h ${TOP_INCDIR}/afs/kaport.h -test tests: install +test tests: all cd test; $(MAKE) clean: $(RM) -f *.o kaserver kas klog multiklog kpasswd klogin rebuild kauth.cs.c kauth.ss.c kauth.xdr.c kauth.h kautils.h kaerrors.c *.a core kpwvalid AFS_component_version_number.c klog.krb knfs klogin.krb kdb Kkauth.xdr.c Kkauth.h Kkauth.cs.c kaserver: kautils.o kalocalcell.o kadatabase.o kaprocs.o kalog.o kauth.ss.o kauth.xdr.o kaserver.o kaaux.o krb_udp.o kaauxdb.o $(LIBS) - ${CC} ${LDFLAGS} -o kaserver kaserver.o kautils.o kalocalcell.o kadatabase.o krb_udp.o kaprocs.o kalog.o kauth.ss.o kauth.xdr.o kaaux.o kaauxdb.o $(LIBS) ${XLIBS} ${SRCDIR}/lib/afs/libaudit.a + ${CC} ${LDFLAGS} -o kaserver kaserver.o kautils.o kalocalcell.o kadatabase.o krb_udp.o kaprocs.o kalog.o kauth.ss.o kauth.xdr.o kaaux.o kaauxdb.o $(LIBS) ${XLIBS} ${TOP_LIBDIR}/libaudit.a kaserver.o: kaserver.c ${INCLS} AFS_component_version_number.o @@ -105,16 +117,16 @@ kauth.cs.o: kauth.cs.c kauth.xdr.o: kauth.xdr.c kauth.h kauth.ss.c kauth.cs.c kauth.xdr.c kauth.h: kauth.rg - ${SRCDIR}/bin/rxgen -x kauth.rg + ${RXGEN} -x kauth.rg Kkauth.cs.c: kauth.rg Kkauth.h - ${SRCDIR}/bin/rxgen -x -k -C -o Kkauth.cs.c kauth.rg + ${RXGEN} -x -k -C -o Kkauth.cs.c kauth.rg Kkauth.xdr.c: kauth.rg - ${SRCDIR}/bin/rxgen -x -k -c -o Kkauth.xdr.c kauth.rg + ${RXGEN} -x -k -c -o Kkauth.xdr.c kauth.rg Kkauth.h: kauth.rg - ${SRCDIR}/bin/rxgen -x -k -h -o Kkauth.h kauth.rg + ${RXGEN} -x -k -h -o Kkauth.h kauth.rg libkauth.a: $(OBJS) AFS_component_version_number.o -$(RM) -f libkauth.a @@ -182,60 +194,58 @@ kpwvalid.o: kpwvalid.c AFS_component_version_number.o kpwvalid: kpwvalid.o $(LIBS) ${CC} ${LDFLAGS} -o kpwvalid kpwvalid.o ${LIBS} ${XLIBS} -user.krb.o: user.c ${INCLS} ${SRCDIR}/include/afs/vice.h +user.krb.o: user.c ${INCLS} ${TOP_INCDIR}/afs/vice.h ${CC} ${CFLAGS} -DAFS_KERBEROS_ENV -c user.c -o user.krb.o -user.o: user.c ${INCLS} ${SRCDIR}/include/afs/vice.h +user.o: user.c ${INCLS} ${TOP_INCDIR}/afs/vice.h ${CC} ${CFLAGS} -c user.c kdb: kdb.o ${INCLS} ${CC} ${LDFLAGS} -o kdb kdb.o libkauth.a ${LIBS} ${XLIBS} kdb.o: kdb.c AFS_component_version_number.o -krb_udp.o: krb_udp.c kaserver.h kautils.h kauth.h prot.h \ - ${SRCDIR}/include/lwp.h AFS_component_version_number.o +krb_udp.o: krb_udp.c kaserver.h kautils.h kauth.h prot.h ${TOP_INCDIR}/lwp.h AFS_component_version_number.o krb_udp: krb_udp.o libkauth.a - ${CC} ${LDFLAGS} -o krb_udp krb_udp.o libkauth.a ${SRCDIR}/lib/liblwp.a ${SRCDIR}/lib/libdes.a ${SRCDIR}/lib/librxkad.a ${SRCDIR}/lib/afs/libcom_err.a ${SRCDIR}/lib/libutil.a ${SRCDIR}/lib/afs/libaudit.a + ${CC} ${LDFLAGS} -o krb_udp krb_udp.o libkauth.a ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/libdes.a ${TOP_LIBDIR}/librxkad.a ${TOP_LIBDIR}/libcom_err.a ${TOP_LIBDIR}/libutil.a ${TOP_LIBDIR}/libaudit.a rebuild.o: rebuild.c $(INCLS) AFS_component_version_number.o -rebuild: rebuild.o kautils.o ${SRCDIR}/lib/afs/libcom_err.a ${SRCDIR}/lib/afs/util.a ${SRCDIR}/lib/libdes.a +rebuild: rebuild.o kautils.o ${TOP_LIBDIR}/libcom_err.a ${TOP_LIBDIR}/util.a ${TOP_LIBDIR}/libdes.a ${CC} ${LDFLAGS} -o rebuild rebuild.o kautils.o \ - ${SRCDIR}/lib/afs/libcom_err.a ${SRCDIR}/lib/afs/util.a ${SRCDIR}/lib/libdes.a ${XLIBS} ${SRCDIR}/lib/afs/libcmd.a - ${INSTALL} -f rebuild ${DESTDIR}/etc/kadb_check + ${TOP_LIBDIR}/libcom_err.a ${TOP_LIBDIR}/util.a ${TOP_LIBDIR}/libdes.a ${XLIBS} ${TOP_LIBDIR}/libcmd.a -system: install - -${DESTDIR}/root.server/usr/afs/bin/kaserver: kaserver +${DEST}/root.server/usr/afs/bin/kaserver: kaserver ${INSTALL} -s $? $@ -${DESTDIR}/etc/kas ${DESTDIR}/root.server/usr/afs/bin/kas: kas +${DEST}/etc/kas ${DEST}/root.server/usr/afs/bin/kas: kas ${INSTALL} -s $? $@ -${DESTDIR}/bin/kpwvalid ${DESTDIR}/etc/kpwvalid \ -${DESTDIR}/root.server/usr/afs/bin/kpwvalid: kpwvalid +${DEST}/bin/kpwvalid ${DEST}/etc/kpwvalid ${DEST}/root.server/usr/afs/bin/kpwvalid: kpwvalid ${INSTALL} $? $@ -${DESTDIR}/bin/klog ${DESTDIR}/root.server/usr/afs/bin/klog: klog +${DEST}/bin/klog ${DEST}/root.server/usr/afs/bin/klog: klog ${INSTALL} -s $? $@ -${DESTDIR}/bin/klog.krb ${DESTDIR}/root.server/usr/afs/bin/klog.krb: klog.krb +${DEST}/bin/klog.krb ${DEST}/root.server/usr/afs/bin/klog.krb: klog.krb ${INSTALL} -s $? $@ -${DESTDIR}/bin/knfs: knfs +${DEST}/bin/knfs: knfs ${INSTALL} -s $? $@ -${DESTDIR}/bin/kpasswd: kpasswd +${DEST}/bin/kpasswd: kpasswd ${INSTALL} -s $? $@ -${DESTDIR}/lib/afs/libkauth.a: libkauth.a +${DEST}/lib/afs/libkauth.a: libkauth.a ${INSTALL} $? $@ -${DESTDIR}/lib/afs/libkauth.krb.a: libkauth.krb.a +${DEST}/lib/afs/libkauth.krb.a: libkauth.krb.a ${INSTALL} $? $@ -${DESTDIR}/etc/kdb: kdb +${DEST}/etc/kadb_check: rebuild + ${INSTALL} -f $? $@ + +${DEST}/etc/kdb: kdb ${INSTALL} -s $? $@ ukinstall webinstall: ${UKERNELDIR}/afs ${UKERNELDIR}/afsint ${UKSRCS} Kkauth.h Kkauth.xdr.c Kkauth.cs.c kauth.h @@ -250,19 +260,132 @@ ${UKERNELDIR}/afs: ${UKERNELDIR}/afsint: mkdir -p $@ -install: all ukinstall ${DESTDIR}/root.server/usr/afs/bin/kaserver \ - ${DESTDIR}/etc/kas ${DESTDIR}/etc/kpwvalid \ - ${DESTDIR}/root.server/usr/afs/bin/kas \ - ${DESTDIR}/root.server/usr/afs/bin/kpwvalid \ - ${DESTDIR}/bin/klog ${DESTDIR}/bin/klog.krb \ - ${DESTDIR}/root.server/usr/afs/bin/klog \ - ${DESTDIR}/root.server/usr/afs/bin/klog.krb \ - ${DESTDIR}/bin/knfs ${DESTDIR}/bin/kpasswd \ - ${DESTDIR}/bin/kpwvalid ${DESTDIR}/lib/afs/libkauth.a \ - ${DESTDIR}/lib/afs/libkauth.krb.a ${DESTDIR}/etc/kdb - ${INSTALL} kautils.h kauth.h kaport.h ${DESTDIR}/include/afs +install: \ + ${DESTDIR}${afssrvlibexecdir}/kaserver \ + ${DESTDIR}${sbindir}/kas \ + ${DESTDIR}${sbindir}/kpwvalid \ + ${DESTDIR}${afssrvsbindir}/kas \ + ${DESTDIR}${afssrvsbindir}/kpwvalid \ + ${DESTDIR}${bindir}/klog \ + ${DESTDIR}${bindir}/klog.krb \ + ${DESTDIR}${afssrvbindir}/klog \ + ${DESTDIR}${afssrvbindir}/klog.krb \ + ${DESTDIR}${bindir}/knfs \ + ${DESTDIR}${bindir}/kpasswd \ + ${DESTDIR}${bindir}/kpwvalid \ + ${DESTDIR}${libdir}/afs/libkauth.a \ + ${DESTDIR}${libdir}/afs/libkauth.krb.a \ + ${DESTDIR}${afssrvsbindir}/kadb_check \ + ${DESTDIR}${afssrvsbindir}/kdb \ + ${DESTDIR}${includedir}/afs/kautils.h \ + ${DESTDIR}${includedir}/afs/kauth.h \ + ${DESTDIR}${includedir}/afs/kaport.h + +${DESTDIR}${afssrvlibexecdir}/kaserver: kaserver + ${INSTALL} -s $? $@ + +${DESTDIR}${sbindir}/kas: kas + ${INSTALL} -s $? $@ + +${DESTDIR}${sbindir}/kpwvalid: kpwvalid + ${INSTALL} $? $@ +${DESTDIR}${afssrvsbindir}/kas: kas + ${INSTALL} -s $? $@ +${DESTDIR}${afssrvsbindir}/kpwvalid: kpwvalid + ${INSTALL} $? $@ + +${DESTDIR}${bindir}/klog: klog + ${INSTALL} -s $? $@ + +${DESTDIR}${bindir}/klog.krb: klog.krb + ${INSTALL} -s $? $@ + +${DESTDIR}${afssrvbindir}/klog: klog + ${INSTALL} -s $? $@ + +${DESTDIR}${afssrvbindir}/klog.krb: klog.krb + ${INSTALL} -s $? $@ + +${DESTDIR}${bindir}/knfs: knfs + ${INSTALL} -s $? $@ + +${DESTDIR}${bindir}/kpasswd: kpasswd + ${INSTALL} -s $? $@ + +${DESTDIR}${bindir}/kpwvalid: kpwvalid + ${INSTALL} $? $@ + +${DESTDIR}${libdir}/afs/libkauth.a: libkauth.a + ${INSTALL} $? $@ + +${TOP_LIBDIR}/libkauth.a: libkauth.a + ${INSTALL} $? $@ + +${DESTDIR}${libdir}/afs/libkauth.krb.a: libkauth.krb.a + ${INSTALL} $? $@ + +${TOP_LIBDIR}/libkauth.krb.a: libkauth.krb.a + ${INSTALL} $? $@ + +${DESTDIR}${afssrvsbindir}/kadb_check: rebuild + ${INSTALL} -f $? $@ + +${DESTDIR}${afssrvsbindir}/kdb: kdb + ${INSTALL} -s $? $@ + +${DEST}/include/afs/kautils.h: kautils.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/kautils.h: kautils.h + ${INSTALL} $? $@ + + +${TOP_INCDIR}/afs/kautils.h: kautils.h + ${INSTALL} $? $@ + + +${DEST}/include/afs/kauth.h: kauth.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/kauth.h: kauth.h + ${INSTALL} $? $@ + + +${TOP_INCDIR}/afs/kauth.h: kauth.h + ${INSTALL} $? $@ + + +${DEST}/include/afs/kaport.h: kaport.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/kaport.h: kaport.h + ${INSTALL} $? $@ + + +${TOP_INCDIR}/afs/kaport.h: kaport.h + ${INSTALL} $? $@ +dest: \ + ${DEST}/root.server/usr/afs/bin/kaserver \ + ${DEST}/etc/kas \ + ${DEST}/etc/kpwvalid \ + ${DEST}/root.server/usr/afs/bin/kas \ + ${DEST}/root.server/usr/afs/bin/kpwvalid \ + ${DEST}/bin/klog \ + ${DEST}/bin/klog.krb \ + ${DEST}/root.server/usr/afs/bin/klog \ + ${DEST}/root.server/usr/afs/bin/klog.krb \ + ${DEST}/bin/knfs \ + ${DEST}/bin/kpasswd \ + ${DEST}/bin/kpwvalid \ + ${DEST}/lib/afs/libkauth.a \ + ${DEST}/lib/afs/libkauth.krb.a \ + ${DEST}/etc/kdb \ + ${DEST}/etc/kadb_check \ + ${DEST}/include/afs/kautils.h \ + ${DEST}/include/afs/kauth.h \ + ${DEST}/include/afs/kaport.h diff --git a/src/kauth/test/Makefile.in b/src/kauth/test/Makefile.in index 4cd7700..e05ae53 100644 --- a/src/kauth/test/Makefile.in +++ b/src/kauth/test/Makefile.in @@ -21,12 +21,14 @@ LIBS= -llwp -ldes -lrxkad -lauth -lcmd -lubik -lprot -lsys -lrx -lcom_err -lkaut CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS} -system: all # the only tests _known_ to work are multiklog and the tcl scripts. all test tests: multiklog +install: +dest: + clean: $(RM) -f *.o core diff --git a/src/libacl/Makefile.in b/src/libacl/Makefile.in index 0be2fbf..30dfdfd 100644 --- a/src/libacl/Makefile.in +++ b/src/libacl/Makefile.in @@ -5,8 +5,22 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -14,8 +28,8 @@ SHELL = /bin/sh include ../config/Makefile.${SYS_NAME} -INCDIRS= -I${TOP_SRCDIR}/config -I${DESTDIR}/include -I.. \ - -I${BACKDIR}/include -I${DESTDIR}/include/afs +INCDIRS=-I${TOP_SRCDIR}/config -I${TOP_INCDIR} -I.. \ + -I${BACKDIR}/include -I${TOP_INCDIR}/afs KERNELDIR = ../libafs/ UKERNELDIR = ../libuafs/ @@ -25,7 +39,7 @@ LIBOBJS=aclprocs.o netprocs.o include ../config/Makefile.version -all: libacl.a +all: kinstall ukinstall ${TOP_LIBDIR}/libacl.a ${TOP_INCDIR}/afs/acl.h ${TOP_INCDIR}/afs/prs_fs.h libacl.a: $(LIBOBJS) AFS_component_version_number.o $(RM) -f libacl.a @@ -47,10 +61,43 @@ kinstall: ukinstall webinstall: ${INSTALL} prs_fs.h ${UKERNELDIR}/afs/prs_fs.h -install: libacl.a kinstall ukinstall - ${INSTALL} libacl.a ${DESTDIR}/lib/afs/libacl.a - ${INSTALL} acl.h ${DESTDIR}/include/afs/acl.h - ${INSTALL} prs_fs.h ${DESTDIR}/include/afs/prs_fs.h +install: ${DESTDIR}${libdir}/afs/libacl.a ${DESTDIR}${includedir}/afs/acl.h ${DESTDIR}${includedir}/afs/prs_fs.h test: cd test; $(MAKE) + +${DEST}/lib/afs/libacl.a: libacl.a + ${INSTALL} $? $@ + +${DESTDIR}${libdir}/afs/libacl.a: libacl.a + ${INSTALL} $? $@ + + +${TOP_LIBDIR}/libacl.a: libacl.a + ${INSTALL} $? $@ + + +${DEST}/include/afs/acl.h: acl.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/acl.h: acl.h + ${INSTALL} $? $@ + + +${TOP_INCDIR}/afs/acl.h: acl.h + ${INSTALL} $? $@ + + +${DEST}/include/afs/prs_fs.h: prs_fs.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/prs_fs.h: prs_fs.h + ${INSTALL} $? $@ + + +${TOP_INCDIR}/afs/prs_fs.h: prs_fs.h + ${INSTALL} $? $@ + + +dest: ${DEST}/lib/afs/libacl.a ${DEST}/include/afs/acl.h ${DEST}/include/afs/prs_fs.h + diff --git a/src/libacl/test/Makefile.in b/src/libacl/test/Makefile.in index 1b8699b..f2f33a0 100644 --- a/src/libacl/test/Makefile.in +++ b/src/libacl/test/Makefile.in @@ -5,22 +5,36 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ OPTIMIZE=-O -INCDIRS= -I${DESTDIR}/include -I.. -LDIRS= -L${DESTDIR}/lib -L${DESTDIR}/lib/afs -L.. +INCDIRS=-I${TOP_INCDIR} -I.. +LDIRS=-L${TOP_LIBDIR} -L${DESTDIR}/lib/afs -L.. LIBS= -lacl -lprot -lubik -lrx -llwp -lauth -lrxkad -lsys ${XLIBS} CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS} -all: install +all: acltest -install: acltest +install: # # Build targets @@ -36,3 +50,5 @@ acltest.o: acltest.c clean: $(RM) -f *.o *.a acltest core +dest: + diff --git a/src/libadmin/Makefile.in b/src/libadmin/Makefile.in index 9247e3c..76fd89e 100644 --- a/src/libadmin/Makefile.in +++ b/src/libadmin/Makefile.in @@ -5,19 +5,41 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ include ../config/Makefile.${SYS_NAME} -all: install +all: ${TOP_INCDIR}/afs/afs_Admin.h -install: ${DESTDIR}/include/afs/afs_Admin.h +install: ${DESTDIR}${includedir}/afs/afs_Admin.h -${DESTDIR}/include/afs/afs_Admin.h: afs_Admin.h +${DEST}/include/afs/afs_Admin.h: afs_Admin.h ${INSTALL} $? $@ clean: +${DESTDIR}${includedir}/afs/afs_Admin.h: afs_Admin.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/afs_Admin.h: afs_Admin.h + ${INSTALL} $? $@ + +dest: ${DEST}/include/afs/afs_Admin.h + diff --git a/src/libadmin/adminutil/Makefile.in b/src/libadmin/adminutil/Makefile.in index 7c87fd1..495119b 100644 --- a/src/libadmin/adminutil/Makefile.in +++ b/src/libadmin/adminutil/Makefile.in @@ -5,8 +5,21 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -14,9 +27,9 @@ SHELL = /bin/sh include ../../config/Makefile.${SYS_NAME} CC = ${MT_CC} -CFLAGS = ${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${MT_CFLAGS} +CFLAGS=${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${MT_CFLAGS} CCRULE = ${CC} ${CFLAGS} -c $? -COMPILE_ET = ${SRCDIR}/bin/compile_et +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et RXKAD = ../../rxkad AUTH = ../../auth BOZO = ../../bozo @@ -27,51 +40,53 @@ UBIK = ../../ubik VLSERVER = ../../vlserver VOLSER = ../../volser +all: ${TOP_LIBDIR}/libafsadminutil.a ${TOP_INCDIR}/afs/afs_utilAdmin.h + afs_AdminBosErrors.c ${DESTDIR}/include/afs/afs_AdminBosErrors.h: afs_AdminBosErrors.et - ${INSTALL} afs_AdminErrors.h ${DESTDIR}/include/afs + ${INSTALL} afs_AdminErrors.h ${TOP_INCDIR}/afs $(RM) -f afs_AdminBosErrors.c afs_AdminBosErrors.h ${COMPILE_ET} afs_AdminBosErrors.et -h afs_AdminBosErrors - cp afs_AdminBosErrors.h ${DESTDIR}/include/afs/afs_AdminBosErrors.h + cp afs_AdminBosErrors.h ${TOP_INCDIR}/afs/afs_AdminBosErrors.h afs_AdminCfgErrors.c ${DESTDIR}/include/afs/afs_AdminCfgErrors.h: afs_AdminCfgErrors.et $(RM) -f afs_AdminCfgErrors.c afs_AdminCfgErrors.h ${COMPILE_ET} afs_AdminCfgErrors.et -h afs_AdminCfgErrors - cp afs_AdminCfgErrors.h ${DESTDIR}/include/afs/afs_AdminCfgErrors.h + cp afs_AdminCfgErrors.h ${TOP_INCDIR}/afs/afs_AdminCfgErrors.h afs_AdminClientErrors.c ${DESTDIR}/include/afs/afs_AdminClientErrors.h: afs_AdminClientErrors.et $(RM) -f afs_AdminClientErrors.c afs_AdminClientErrors.h ${COMPILE_ET} afs_AdminClientErrors.et -h afs_AdminClientErrors - cp afs_AdminClientErrors.h ${DESTDIR}/include/afs/afs_AdminClientErrors.h + cp afs_AdminClientErrors.h ${TOP_INCDIR}/afs/afs_AdminClientErrors.h afs_AdminMiscErrors.c ${DESTDIR}/include/afs/afs_AdminMiscErrors.h: afs_AdminMiscErrors.et $(RM) -f afs_AdminMiscErrors.c afs_AdminMiscErrors.h ${COMPILE_ET} afs_AdminMiscErrors.et -h afs_AdminMiscErrors - cp afs_AdminMiscErrors.h ${DESTDIR}/include/afs/afs_AdminMiscErrors.h + cp afs_AdminMiscErrors.h ${TOP_INCDIR}/afs/afs_AdminMiscErrors.h afs_AdminCommonErrors.c ${DESTDIR}/include/afs/afs_AdminCommonErrors.h: afs_AdminCommonErrors.et $(RM) -f afs_AdminCommonErrors.c afs_AdminCommonErrors.h ${COMPILE_ET} afs_AdminCommonErrors.et -h afs_AdminCommonErrors - cp afs_AdminCommonErrors.h ${DESTDIR}/include/afs/afs_AdminCommonErrors.h + cp afs_AdminCommonErrors.h ${TOP_INCDIR}/afs/afs_AdminCommonErrors.h afs_AdminKasErrors.c ${DESTDIR}/include/afs/afs_AdminKasErrors.h: afs_AdminKasErrors.et $(RM) -f afs_AdminKasErrors.c afs_AdminKasErrors.h ${COMPILE_ET} afs_AdminKasErrors.et -h afs_AdminKasErrors - cp afs_AdminKasErrors.h ${DESTDIR}/include/afs/afs_AdminKasErrors.h + cp afs_AdminKasErrors.h ${TOP_INCDIR}/afs/afs_AdminKasErrors.h afs_AdminPtsErrors.c ${DESTDIR}/include/afs/afs_AdminPtsErrors.h: afs_AdminPtsErrors.et $(RM) -f afs_AdminPtsErrors.c afs_AdminPtsErrors.h ${COMPILE_ET} afs_AdminPtsErrors.et -h afs_AdminPtsErrors - cp afs_AdminPtsErrors.h ${DESTDIR}/include/afs/afs_AdminPtsErrors.h + cp afs_AdminPtsErrors.h ${TOP_INCDIR}/afs/afs_AdminPtsErrors.h afs_AdminUtilErrors.c ${DESTDIR}/include/afs/afs_AdminUtilErrors.h: afs_AdminUtilErrors.et $(RM) -f afs_AdminUtilErrors.c afs_AdminUtilErrors.h ${COMPILE_ET} afs_AdminUtilErrors.et -h afs_AdminUtilErrors - cp afs_AdminUtilErrors.h ${DESTDIR}/include/afs/afs_AdminUtilErrors.h + cp afs_AdminUtilErrors.h ${TOP_INCDIR}/afs/afs_AdminUtilErrors.h afs_AdminVosErrors.c ${DESTDIR}/include/afs/afs_AdminVosErrors.h: afs_AdminVosErrors.et $(RM) -f afs_AdminVosErrors.c afs_AdminVosErrors.h ${COMPILE_ET} afs_AdminVosErrors.et -h afs_AdminVosErrors - cp afs_AdminVosErrors.h ${DESTDIR}/include/afs/afs_AdminVosErrors.h + cp afs_AdminVosErrors.h ${TOP_INCDIR}/afs/afs_AdminVosErrors.h ERROROBJS = \ rxkad_errs.o \ @@ -99,13 +114,27 @@ ADMINOBJS = \ LIBOBJS = ${ADMINOBJS} ${ERROROBJS} -LIBADMINUTIL = ${DESTDIR}/lib/afs/libafsadminutil.a +install: ${DESTDIR}${libdir}/afs/libafsadminutil.a ${DESTDIR}${includedir}/afs/afs_utilAdmin.h + +dest: ${DEST}/lib/afs/libafsadminutil.a ${DEST}/include/afs/afs_utilAdmin.h + +${DESTDIR}${libdir}/afs/libafsadminutil.a: libafsadminutil.a + ${INSTALL} $? $@ + +${DEST}/lib/afs/libafsadminutil.a: libafsadminutil.a + ${INSTALL} $? $@ + +${TOP_LIBDIR}/libafsadminutil.a: libafsadminutil.a + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/afs_utilAdmin.h: afs_utilAdmin.h + ${INSTALL} $? $@ -system install: ${LIBADMINUTIL} +${DEST}/include/afs/afs_utilAdmin.h: afs_utilAdmin.h + ${INSTALL} $? $@ -${LIBADMINUTIL}: libafsadminutil.a - ${INSTALL} afs_utilAdmin.h ${DESTDIR}/include/afs - ${INSTALL} libafsadminutil.a ${LIBADMINUTIL} +${TOP_INCDIR}/afs/afs_utilAdmin.h: afs_utilAdmin.h + ${INSTALL} $? $@ libafsadminutil.a: ${LIBOBJS} -$(RM) -f $@ diff --git a/src/libadmin/bos/Makefile.in b/src/libadmin/bos/Makefile.in index 7ab6001..fd7edeb 100644 --- a/src/libadmin/bos/Makefile.in +++ b/src/libadmin/bos/Makefile.in @@ -5,8 +5,22 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -14,7 +28,7 @@ SHELL = /bin/sh include ../../config/Makefile.${SYS_NAME} CC = ${MT_CC} -CFLAGS = ${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${MT_CFLAGS} +CFLAGS=${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${MT_CFLAGS} CCRULE = ${CC} ${CFLAGS} -c $? BOZO = ../../bozo/ @@ -25,13 +39,31 @@ BOZOOBJS = bosint.xdr.o bosint.cs.o LIBOBJS = ${ADMINOBJS} ${BOZOOBJS} -LIBBOSADMIN = ${DESTDIR}/lib/afs/libbosadmin.a +all: ${TOP_INCDIR}/afs/afs_bosAdmin.h ${TOP_LIBDIR}/libbosadmin.a -system install: ${LIBBOSADMIN} +install: ${DESTDIR}${includedir}/afs/afs_bosAdmin.h ${DESTDIR}${libdir}/afs/libbosadmin.a + +dest: ${DEST}/include/afs/afs_bosAdmin.h ${DEST}/lib/afs/libbosadmin.a + +${TOP_INCDIR}/afs/afs_bosAdmin.h: afs_bosAdmin.h + ${INSTALL} $? $@ + +${DEST}/include/afs/afs_bosAdmin.h: afs_bosAdmin.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/afs_bosAdmin.h: afs_bosAdmin.h + ${INSTALL} $? $@ + + +${TOP_LIBDIR}/libbosadmin.a: libbosadmin.a + ${INSTALL} $? $@ + +${DEST}/lib/afs/libbosadmin.a: libbosadmin.a + ${INSTALL} $? $@ + +${DESTDIR}${libdir}/afs/libbosadmin.a: libbosadmin.a + ${INSTALL} $? $@ -${LIBBOSADMIN}: libbosadmin.a - ${INSTALL} afs_bosAdmin.h ${DESTDIR}/include/afs - ${INSTALL} libbosadmin.a ${LIBBOSADMIN} libbosadmin.a: ${LIBOBJS} -$(RM) -f $@ diff --git a/src/libadmin/cfg/Makefile.in b/src/libadmin/cfg/Makefile.in index 3d5c42f..3654d18 100644 --- a/src/libadmin/cfg/Makefile.in +++ b/src/libadmin/cfg/Makefile.in @@ -5,15 +5,29 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ SHELL = /bin/sh include ../../config/Makefile.${SYS_NAME} -CFLAGS = ${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${MT_CFLAGS} +CFLAGS=${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${MT_CFLAGS} CCRULE = ${CC} ${CFLAGS} -c $? UBIKOBJS=\ @@ -32,13 +46,29 @@ LIBOBJS =\ ${CFGOBJS} -LIBCFGADMIN = ${DESTDIR}/lib/afs/libcfgadmin.a +all: ${TOP_INCDIR}/afs/afs_cfgAdmin.h ${TOP_LIBDIR}/libcfgadmin.a -system install: ${LIBCFGADMIN} +install: ${DESTDIR}${includedir}/afs/afs_cfgAdmin.h ${DESTDIR}${libdir}/afs/libcfgadmin.a -${LIBCFGADMIN}: libcfgadmin.a - ${INSTALL} afs_cfgAdmin.h ${DESTDIR}/include/afs - ${INSTALL} libcfgadmin.a ${LIBCFGADMIN} +dest: ${DEST}/include/afs/afs_cfgAdmin.h ${DEST}/lib/afs/libcfgadmin.a + +${TOP_INCDIR}/afs/afs_cfgAdmin.h: afs_cfgAdmin.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/afs_cfgAdmin.h: afs_cfgAdmin.h + ${INSTALL} $? $@ + +${DEST}/include/afs/afs_cfgAdmin.h: afs_cfgAdmin.h + ${INSTALL} $? $@ + +${TOP_LIBDIR}/libcfgadmin.a: libcfgadmin.a + ${INSTALL} $? $@ + +${DESTDIR}${libdir}/afs/libcfgadmin.a: libcfgadmin.a + ${INSTALL} $? $@ + +${DEST}/lib/afs/libcfgadmin.a: libcfgadmin.a + ${INSTALL} $? $@ libcfgadmin.a: ${LIBOBJS} -$(RM) -f $@ diff --git a/src/libadmin/client/Makefile.in b/src/libadmin/client/Makefile.in index ab995c5..a81c1ef 100644 --- a/src/libadmin/client/Makefile.in +++ b/src/libadmin/client/Makefile.in @@ -5,8 +5,22 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -14,19 +28,35 @@ SHELL = /bin/sh include ../../config/Makefile.${SYS_NAME} CC = ${MT_CC} -CFLAGS = ${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${MT_CFLAGS} +CFLAGS=${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${MT_CFLAGS} ADMINOBJS = afs_clientAdmin.o LIBOBJS = ${ADMINOBJS} -LIBCLIENTADMIN = ${DESTDIR}/lib/afs/libclientadmin.a +all: ${TOP_INCDIR}/afs/afs_clientAdmin.h ${TOP_LIBDIR}/libclientadmin.a -system install: ${LIBCLIENTADMIN} +install: ${DESTDIR}${includedir}/afs/afs_clientAdmin.h ${DESTDIR}${libdir}/afs/libclientadmin.a -${LIBCLIENTADMIN}: libclientadmin.a - ${INSTALL} afs_clientAdmin.h ${DESTDIR}/include/afs - ${INSTALL} libclientadmin.a ${LIBCLIENTADMIN} +dest: ${DEST}/include/afs/afs_clientAdmin.h ${DEST}/lib/afs/libclientadmin.a + +${TOP_INCDIR}/afs/afs_clientAdmin.h: afs_clientAdmin.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/afs_clientAdmin.h: afs_clientAdmin.h + ${INSTALL} $? $@ + +${DEST}/include/afs/afs_clientAdmin.h: afs_clientAdmin.h + ${INSTALL} $? $@ + +${TOP_LIBDIR}/libclientadmin.a: libclientadmin.a + ${INSTALL} $? $@ + +${DESTDIR}${libdir}/afs/libclientadmin.a: libclientadmin.a + ${INSTALL} $? $@ + +${DEST}/lib/afs/libclientadmin.a: libclientadmin.a + ${INSTALL} $? $@ libclientadmin.a: ${LIBOBJS} -$(RM) -f $@ diff --git a/src/libadmin/kas/Makefile.in b/src/libadmin/kas/Makefile.in index 3c7e405..4bb527e 100644 --- a/src/libadmin/kas/Makefile.in +++ b/src/libadmin/kas/Makefile.in @@ -5,8 +5,22 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -14,7 +28,7 @@ SHELL = /bin/sh include ../../config/Makefile.${SYS_NAME} CC = ${MT_CC} -CFLAGS = ${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${MT_CFLAGS} +CFLAGS=${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${MT_CFLAGS} CCRULE = ${CC} ${CFLAGS} -c $? KAUTH= ../../kauth/ @@ -28,13 +42,29 @@ KAUTHOBJS = \ LIBOBJS = ${ADMINOBJS} ${KAUTHOBJS} -LIBKASADMIN = ${DESTDIR}/lib/afs/libkasadmin.a +all: ${TOP_INCDIR}/afs/afs_kasAdmin.h ${TOP_LIBDIR}/libkasadmin.a -system install: ${LIBKASADMIN} +install: ${DESTDIR}${includedir}/afs/afs_kasAdmin.h ${DESTDIR}${libdir}/afs/libkasadmin.a -${LIBKASADMIN}: libkasadmin.a - ${INSTALL} afs_kasAdmin.h ${DESTDIR}/include/afs - ${INSTALL} libkasadmin.a ${LIBKASADMIN} +dest: ${DEST}/include/afs/afs_kasAdmin.h ${DEST}/lib/afs/libkasadmin.a + +${TOP_INCDIR}/afs/afs_kasAdmin.h: afs_kasAdmin.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/afs_kasAdmin.h: afs_kasAdmin.h + ${INSTALL} $? $@ + +${DEST}/include/afs/afs_kasAdmin.h: afs_kasAdmin.h + ${INSTALL} $? $@ + +${TOP_LIBDIR}/libkasadmin.a: libkasadmin.a + ${INSTALL} $? $@ + +${DESTDIR}${libdir}/afs/libkasadmin.a: libkasadmin.a + ${INSTALL} $? $@ + +${DEST}/lib/afs/libkasadmin.a: libkasadmin.a + ${INSTALL} $? $@ libkasadmin.a: ${LIBOBJS} -$(RM) -f $@ diff --git a/src/libadmin/pts/Makefile.in b/src/libadmin/pts/Makefile.in index caa8c2b..390a9e7 100644 --- a/src/libadmin/pts/Makefile.in +++ b/src/libadmin/pts/Makefile.in @@ -5,8 +5,22 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -14,7 +28,7 @@ SHELL = /bin/sh include ../../config/Makefile.${SYS_NAME} CC = ${MT_CC} -CFLAGS = ${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${MT_CFLAGS} +CFLAGS=${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${MT_CFLAGS} CCRULE = ${CC} ${CFLAGS} -c $? PTSERVER = ../../ptserver/ @@ -28,13 +42,29 @@ PTSERVEROBJS = \ LIBOBJS = ${ADMINOBJS} ${PTSERVEROBJS} -LIBPTSADMIN = ${DESTDIR}/lib/afs/libptsadmin.a +all: ${TOP_INCDIR}/afs/afs_ptsAdmin.h ${TOP_LIBDIR}/libptsadmin.a -system install: ${LIBPTSADMIN} +install: ${DESTDIR}${includedir}/afs/afs_ptsAdmin.h ${DESTDIR}${libdir}/afs/libptsadmin.a -${LIBPTSADMIN}: libptsadmin.a - ${INSTALL} afs_ptsAdmin.h ${DESTDIR}/include/afs - ${INSTALL} libptsadmin.a ${LIBPTSADMIN} +dest: ${DEST}/include/afs/afs_ptsAdmin.h ${DEST}/lib/afs/libptsadmin.a + +${TOP_INCDIR}/afs/afs_ptsAdmin.h: afs_ptsAdmin.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/afs_ptsAdmin.h: afs_ptsAdmin.h + ${INSTALL} $? $@ + +${DEST}/include/afs/afs_ptsAdmin.h: afs_ptsAdmin.h + ${INSTALL} $? $@ + +${TOP_LIBDIR}/libptsadmin.a: libptsadmin.a + ${INSTALL} $? $@ + +${DESTDIR}${libdir}/afs/libptsadmin.a: libptsadmin.a + ${INSTALL} $? $@ + +${DEST}/lib/afs/libptsadmin.a: libptsadmin.a + ${INSTALL} $? $@ libptsadmin.a: ${LIBOBJS} -$(RM) -f $@ diff --git a/src/libadmin/samples/Makefile.in b/src/libadmin/samples/Makefile.in index f26f216..53b83f6 100644 --- a/src/libadmin/samples/Makefile.in +++ b/src/libadmin/samples/Makefile.in @@ -5,15 +5,27 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ include ../../config/Makefile.${SYS_NAME} CC = ${MT_CC} -CFLAGS = ${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${MT_CFLAGS} +CFLAGS = ${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${MT_CFLAGS} ######################################################################## @@ -43,12 +55,12 @@ SAMPLEPROGS=\ rxstat_query_process SAMPLELIBS =\ - ${DESTDIR}/lib/afs/libafsadminutil.a \ - ${DESTDIR}/lib/afs/libclientadmin.a \ - ${DESTDIR}/lib/afs/libvosadmin.a \ - ${DESTDIR}/lib/afs/libbosadmin.a \ - ${DESTDIR}/lib/libafsauthent.a \ - ${DESTDIR}/lib/libafsrpc.a + ${TOP_LIBDIR}/libafsadminutil.a \ + ${TOP_LIBDIR}/libclientadmin.a \ + ${TOP_LIBDIR}/libvosadmin.a \ + ${TOP_LIBDIR}/libbosadmin.a \ + ${TOP_LIBDIR}/libafsauthent.a \ + ${TOP_LIBDIR}/libafsrpc.a cm_client_config: cm_client_config.o $(SAMPLELIBS) $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS) @@ -114,7 +126,12 @@ rxstat_query_process: rxstat_query_process.o $(SAMPLELIBS) $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MTLIBS) $(XLIBS) ####################################################################### -install test tests: $(SAMPLEPROGS) +all test tests: $(SAMPLEPROGS) + +install: + +dest: clean: $(RM) -f *.o $(SAMPLEPROGS) core + diff --git a/src/libadmin/test/Makefile.in b/src/libadmin/test/Makefile.in index b2d43da..c87db45 100644 --- a/src/libadmin/test/Makefile.in +++ b/src/libadmin/test/Makefile.in @@ -5,30 +5,42 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ include ../../config/Makefile.${SYS_NAME} CC = ${MT_CC} -CFLAGS = ${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${MT_CFLAGS} +CFLAGS = ${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${MT_CFLAGS} ######################################################################## # build tests AFSCPLIBS =\ - $(DESTDIR)/lib/afs/libafsadminutil.a \ - $(DESTDIR)/lib/afs/libclientadmin.a \ - $(DESTDIR)/lib/afs/libbosadmin.a \ - $(DESTDIR)/lib/afs/libvosadmin.a \ - $(DESTDIR)/lib/afs/libkasadmin.a \ - $(DESTDIR)/lib/afs/libptsadmin.a \ - $(DESTDIR)/lib/libafsauthent.a \ - $(DESTDIR)/lib/libafsrpc.a \ - $(DESTDIR)/lib/afs/libcmd.a # static library + $(TOP_LIBDIR)/libafsadminutil.a \ + $(TOP_LIBDIR)/libclientadmin.a \ + $(TOP_LIBDIR)/libbosadmin.a \ + $(TOP_LIBDIR)/libvosadmin.a \ + $(TOP_LIBDIR)/libkasadmin.a \ + $(TOP_LIBDIR)/libptsadmin.a \ + $(TOP_LIBDIR)/libafsauthent.a \ + $(TOP_LIBDIR)/libafsrpc.a \ + $(TOP_LIBDIR)/libcmd.a # static library AFSCPOBJS =\ bos.o \ @@ -40,10 +52,14 @@ AFSCPOBJS =\ afscp: afscp.o $(AFSCPOBJS) $(AFSCPLIBS) $(CC) $(CFLAGS) -o afscp afscp.o $(AFSCPOBJS) \ - -LDEST/lib/afs $(AFSCPLIBS) ${MTLIBS} $(XLIBS) + -L${TOP_LIBDIR} $(AFSCPLIBS) ${MTLIBS} $(XLIBS) ####################################################################### -install test tests: afscp +all test tests: afscp + +install: + +dest: clean: $(RM) -f *.o afscp core diff --git a/src/libadmin/vos/Makefile.in b/src/libadmin/vos/Makefile.in index 4d7afab..5746b82 100644 --- a/src/libadmin/vos/Makefile.in +++ b/src/libadmin/vos/Makefile.in @@ -5,8 +5,22 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -14,7 +28,7 @@ SHELL = /bin/sh include ../../config/Makefile.${SYS_NAME} CC = ${MT_CC} -CFLAGS = ${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${MT_CFLAGS} +CFLAGS=${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${MT_CFLAGS} CCRULE = ${CC} ${CFLAGS} -c $? VLSERVER = ../../vlserver/ @@ -41,13 +55,33 @@ FSINTOBJS =\ LIBOBJS = ${ADMINOBJS} ${VLSERVEROBJS} ${VOLSEROBJS} ${FSINTOBJS} -LIBVOSADMIN = ${DESTDIR}/lib/afs/libvosadmin.a +LIBVOSADMIN=${TOP_LIBDIR}/libvosadmin.a -system install: ${LIBVOSADMIN} +all: ${TOP_INCDIR}/afs/afs_vosAdmin.h ${TOP_LIBDIR}/libvosadmin.a + +install: ${DESTDIR}${includedir}/afs/afs_vosAdmin.h ${DESTDIR}${libdir}/afs/libvosadmin.a + +dest: ${DEST}/include/afs/afs_vosAdmin.h ${DEST}/lib/afs/libvosadmin.a + +${TOP_INCDIR}/afs/afs_vosAdmin.h: afs_vosAdmin.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/afs_vosAdmin.h: afs_vosAdmin.h + ${INSTALL} $? $@ + +${DEST}/include/afs/afs_vosAdmin.h: afs_vosAdmin.h + ${INSTALL} $? $@ + + +${TOP_LIBDIR}/libvosadmin.a: libvosadmin.a + ${INSTALL} $? $@ + +${DESTDIR}${libdir}/afs/libvosadmin.a: libvosadmin.a + ${INSTALL} $? $@ + +${DEST}/lib/afs/libvosadmin.a: libvosadmin.a + ${INSTALL} $? $@ -${LIBVOSADMIN}: libvosadmin.a - ${INSTALL} afs_vosAdmin.h ${DESTDIR}/include/afs - ${INSTALL} libvosadmin.a ${LIBVOSADMIN} libvosadmin.a: ${LIBOBJS} -$(RM) -f $@ diff --git a/src/libafs/Makefile.common b/src/libafs/Makefile.common index 30f92a4..31646c3 100644 --- a/src/libafs/Makefile.common +++ b/src/libafs/Makefile.common @@ -38,16 +38,18 @@ system: all kinstall: install install: all $(INSTDIRS) +dest: all $(DESTDIRS) all: setup $(COMPDIRS) -single_compdir single_instdir: +single_compdir single_instdir single_destdir: cd $(KOBJ) ; \ echo $(MAKE) DESTDIR=${DESTDIR} $@_libafs; \ $(MAKE) DESTDIR=${DESTDIR} $@_libafs; single_compdir_libafs: libafs single_instdir_libafs: install_libafs +single_destdir_libafs: dest_libafs AFSAOBJS = \ afs_atomlist.o \ diff --git a/src/libafs/MakefileProto.AIX.in b/src/libafs/MakefileProto.AIX.in index 1743b55..e723185 100644 --- a/src/libafs/MakefileProto.AIX.in +++ b/src/libafs/MakefileProto.AIX.in @@ -7,9 +7,22 @@ # MakefileProto for AIX systems # -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ TOP_SRCDIR=@TOP_SRCDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +afskerneldir=@afskerneldir@ SYS_NAME=@AFS_SYSNAME@ include config/Makefile.${SYS_NAME} @@ -52,7 +65,7 @@ OPT2 = -O IMPORTS = -bI:/lib/kernex.exp -bI:/lib/syscalls.exp -bI:/lib/sockets.exp \ -bI:/lib/netinet.exp \ - -bI:${DESTDIR}/lib/afs/extras.exp -bI:${DESTDIR}/lib/afs/export.exp + -bI:${TOP_LIBDIR}/extras.exp -bI:${TOP_LIBDIR}/export.exp KDEFS = -U_IBMR2 -D_POWER -D_AIX -DNLS -D_NLS -DMSG -D__STR31__ -Daiws \ -D_POWER_RS -D_POWER_PC -D_POWER_RS1 -D_POWER_RS2 -D_POWER_RSC \ -D_POWER_601 -D_POWER_603 -D_POWER_604 -D_THREADS -M -D_KERNEL \ @@ -60,7 +73,7 @@ KDEFS = -U_IBMR2 -D_POWER -D_AIX -DNLS -D_NLS -DMSG -D__STR31__ -Daiws \ -DGETMOUNT -H8 -DAFS -DAFS_COMMON -D_VOPS -D_SUN -DKERNEL LDSTUFF= -b"binder:/usr/lib/bind glink:/usr/lib/glink.o" -bnoentry -b h:4 \ -D0 -T512 -LDFLAGS = -m -eafs_config -bexport:${DESTDIR}/lib/afs/afs.exp ${IMPORTS} \ +LDFLAGS = -m -eafs_config -bexport:${TOP_LIBDIR}/afs.exp ${IMPORTS} \ -lsys -lcsys CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${FSINCLUDES} $(KDEFS) $(KOPTS) ${DBUG} @@ -71,6 +84,7 @@ KOBJ = MODLOAD # This tells Makefile.common to use it's single directory build target. COMPDIRS = single_compdir INSTDIRS = single_instdir +DESTDIRS = single_destdir include Makefile.common @@ -90,21 +104,20 @@ setup: ln -s /usr/include/jfs ufs - - - # Standard AFS->NFS translator support is removed in AFS 3.5 in favor of # the iauth authentication mechanism. The model was changed by IBM in the # middle of an OS release. So iauth is only supported on AIX 4.1.5 and # later 4.1.x (if they are ever made) and AIX 4.2.1 (and later AIX 4.2.x if # they are ever made. AIX 4.3 also uses the iauth translator. -CLIENTDIR = $(DESTDIR)root.client/usr/vice/etc/dkload LIBAFSIAUTH = afs.ext.iauth LIBAFS = afs.ext -DEST_LIBAFSIAUTH = $(CLIENTDIR)/$(LIBAFSIAUTH) -DEST_LIBAFS = $(CLIENTDIR)/$(LIBAFS) +DEST_LIBAFSIAUTH = $(DEST)root.client/usr/vice/etc/dkload/$(LIBAFSIAUTH) +DEST_LIBAFS = $(DEST)root.client/usr/vice/etc/dkload/$(LIBAFS) + +INST_LIBAFSIAUTH = ${DESTDIR}${afskerneldir}/$(LIBAFSIAUTH) +INST_LIBAFS = ${DESTDIR}${afskerneldir}/$(LIBAFS) $(DEST_LIBAFS): $(LIBAFS) $(INSTALL) -f $? $@ @@ -116,6 +129,15 @@ $(DEST_LIBAFSIAUTH): $(LIBAFSIAUTH) -${STRIP} $@ $(INSTALL) -f $?.map $@.map +$(INST_LIBAFS): $(LIBAFS) + $(INSTALL) -f $? $@ + -${STRIP} $@ + $(INSTALL) -f $?.map $@.map + +$(INST_LIBAFSIAUTH): $(LIBAFSIAUTH) + $(INSTALL) -f $? $@ + -${STRIP} $@ + $(INSTALL) -f $?.map $@.map $(LIBAFSIAUTH): $(AFSAOBJS) $(AFSIAUTHOBJS) @@ -129,7 +151,8 @@ $(LIBAFS): $(AFSAOBJS) $(AFSNOIAUTHOBJS) ${AFSAOBJS} $(AFSNOIAUTHOBJS) ${LIBS} ${LDFLAGS} libafs: $(LIBAFS) $(LIBAFSIAUTH) -install_libafs: $(DEST_LIBAFS) $(DEST_LIBAFSIAUTH) +install_libafs: $(INST_LIBAFS) $(INST_LIBAFSIAUTH) +dest_libafs: $(DEST_LIBAFS) $(DEST_LIBAFSIAUTH) # Object build rules: diff --git a/src/libafs/MakefileProto.DARWIN.in b/src/libafs/MakefileProto.DARWIN.in index 51ca916..59396e0 100644 --- a/src/libafs/MakefileProto.DARWIN.in +++ b/src/libafs/MakefileProto.DARWIN.in @@ -3,9 +3,22 @@ # # MakefileProto for Digital Unix systems # -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ TOP_SRCDIR=@TOP_SRCDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +afskerneldir=@afskerneldir@ SYS_NAME=@AFS_SYSNAME@ include config/Makefile.${SYS_NAME} @@ -49,6 +62,7 @@ KOBJ = MODLOAD # This tells Makefile.common to use it's single directory build target. COMPDIRS = single_compdir INSTDIRS = single_instdir +DESTDIRS = single_destdir include Makefile.common @@ -73,14 +87,23 @@ setup: LIBAFS = libafs.o LIBAFSNONFS = libafs.nonfs.o -DEST_LIBAFS = ${DESTDIR}/root.client/usr/vice/etc/afs.kext/Contents/MacOS/afs-nfs -DEST_LIBAFSNONFS = ${DESTDIR}/root.client/usr/vice/etc/afs.kext/Contents/MacOS/afs +INST_LIBAFS = ${DESTDIR}${afskerneldir}/afs-nfs +INST_LIBAFSNONFS = ${DESTDIR}${afskerneldir}/afs +DEST_LIBAFS = ${DEST}/root.client/usr/vice/etc/afs.kext/Contents/MacOS/afs-nfs +DEST_LIBAFSNONFS = ${DEST}/root.client/usr/vice/etc/afs.kext/Contents/MacOS/afs libafs: $(LIBAFSNONFS) ; -install_libafs: $(DEST_LIBAFSNONFS) ; +install_libafs: $(INST_LIBAFSNONFS) ; +dest_libafs: $(DEST_LIBAFSNONFS) ; +$(INST_LIBAFS): $(LIBAFS) + $(INSTALL) -f $? $@ + +$(INST_LIBAFSNONFS): $(LIBAFSNONFS) + $(INSTALL) -f $? $@ + $(DEST_LIBAFS): $(LIBAFS) $(INSTALL) -f $? $@ diff --git a/src/libafs/MakefileProto.DUX.in b/src/libafs/MakefileProto.DUX.in index 5b810de..cf848da 100644 --- a/src/libafs/MakefileProto.DUX.in +++ b/src/libafs/MakefileProto.DUX.in @@ -7,9 +7,22 @@ # MakefileProto for Digital Unix systems # -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ TOP_SRCDIR=@TOP_SRCDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +afskerneldir=@afskerneldir@ SYS_NAME=@AFS_SYSNAME@ include config/Makefile.${SYS_NAME} @@ -52,6 +65,7 @@ KOBJ = STATIC # This tells Makefile.common to use it's single directory build target. COMPDIRS = single_compdir INSTDIRS = single_instdir +DESTDIRS = single_destdir include Makefile.common @@ -79,18 +93,30 @@ LIBAFS = libafs.o LIBAFSNONFS = libafs.nonfs.o AFSMOD = afs.mod -DEST_LIBAFS = ${DESTDIR}/root.client/bin/${LIBAFS} -DEST_LIBAFSNONFS = ${DESTDIR}/root.client/bin/${LIBAFSNONFS} -DEST_AFSMOD = ${DESTDIR}/root.client/bin/${AFSMOD} +INST_LIBAFS = ${DESTDIR}${afskerneldir}/${LIBAFS} +INST_LIBAFSNONFS = ${DESTDIR}${afskerneldir}/${LIBAFSNONFS} +INST_AFSMOD = ${DESTDIR}${afskerneldir}/${AFSMOD} +DEST_LIBAFS = ${DEST}/root.client/bin/${LIBAFS} +DEST_LIBAFSNONFS = ${DEST}/root.client/bin/${LIBAFSNONFS} +DEST_AFSMOD = ${DEST}/root.client/bin/${AFSMOD} -# libafs: ${DEST_LIBAFS} ${DEST_LIBAFSNONFS} ${DEST_AFSMOD} .PHONY: libafs install_libafs libafs: ${LIBAFSNONFS} ${AFSMOD} -install_libafs: ${DEST_LIBAFSNONFS} ${DEST_AFSMOD} +install_libafs: ${INST_LIBAFSNONFS} ${INST_AFSMOD} +dest_libafs: ${DEST_LIBAFSNONFS} ${DEST_AFSMOD} +${INST_LIBAFS}: ${LIBAFS} + $(INSTALL) -f $? $@ + +${INST_LIBAFSNONFS}: ${LIBAFSNONFS} + $(INSTALL) -f $? $@ + +${INST_AFSMOD}: ${AFSMOD} + $(INSTALL) -f $? $@ + ${DEST_LIBAFS}: ${LIBAFS} $(INSTALL) -f $? $@ diff --git a/src/libafs/MakefileProto.FBSD.in b/src/libafs/MakefileProto.FBSD.in index 7e91cdc..67e3c39 100644 --- a/src/libafs/MakefileProto.FBSD.in +++ b/src/libafs/MakefileProto.FBSD.in @@ -2,9 +2,22 @@ # # MakefileProto for FreeBSD systems # -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ TOP_SRCDIR=@TOP_SRCDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +afskerneldir=@afskerneldir@ SYS_NAME=@AFS_SYSNAME@ # include config/Makefile.${SYS_NAME} @@ -47,6 +60,7 @@ KOBJ = STATIC # This tells Makefile.common to use it's single directory build target. COMPDIRS = single_compdir INSTDIRS = single_instdir +DESTDIRS = single_destdir include Makefile.common @@ -73,20 +87,34 @@ setup: LIBAFS = libafs.o LIBAFSNONFS = libafs.nonfs.o -DEST_LIBAFS = ${DESTDIR}/root.client/bin/${LIBAFS} -DEST_LIBAFSNONFS = ${DESTDIR}/root.client/bin/${LIBAFSNONFS} +INST_LIBAFS ${DESTDIR}${afskerneldir}/${LIBAFS} +INST_LIBAFSNONFS = ${DESTDIR}${afskerneldir}/${LIBAFSNONFS} + +DEST_LIBAFS = ${DEST}/root.client/bin/${LIBAFS} +DEST_LIBAFSNONFS = ${DEST}/root.client/bin/${LIBAFSNONFS} # libafs: $(LIBAFS) $(LIBAFSNONFS) # libafs: $(LIBAFSNONFS) -# install_libafs: $(DEST_LIBAFS) $(DEST_LIBAFSNONFS) -# install_libafs: $(DEST_LIBAFSNONFS) +# install_libafs: $(INST_LIBAFS) $(INST_LIBAFSNONFS) +# install_libafs: $(INST_LIBAFSNONFS) +# dest_libafs: $(DEST_LIBAFS) $(DEST_LIBAFSNONFS) +# dest_libafs: $(DEST_LIBAFSNONFS) libafs: echo WARNING: No kernel module for ${SYS_NAME} install_libafs: echo WARNING: No kernel module for ${SYS_NAME} +dest_libafs: + echo WARNING: No kernel module for ${SYS_NAME} + + +$(INST_LIBAFS): $(LIBAFS) + $(INSTALL) -f $? $@ + +$(INST_LIBAFSNONFS): $(LIBAFSNONFS) + $(INSTALL) -f $? $@ $(DEST_LIBAFS): $(LIBAFS) $(INSTALL) -f $? $@ diff --git a/src/libafs/MakefileProto.HPUX.in b/src/libafs/MakefileProto.HPUX.in index 1f46a1a..ab50ceb 100644 --- a/src/libafs/MakefileProto.HPUX.in +++ b/src/libafs/MakefileProto.HPUX.in @@ -7,9 +7,22 @@ # MakefileProto for HP systems # -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ TOP_SRCDIR=@TOP_SRCDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +afskerneldir=@afskerneldir@ SYS_NAME=@AFS_SYSNAME@ include config/Makefile.${SYS_NAME} @@ -74,6 +87,7 @@ KOBJ=STATIC # This is the hpux multiple directory target. COMPDIRS = hpux_compdirs INSTDIRS = hpux_instdirs +DESTDIRS = hpux_destdirs include Makefile.common @@ -105,7 +119,7 @@ setup: echo Setup complete. # Compile the clients. -${COMPDIRS} ${INSTDIRS}: +${COMPDIRS} ${INSTDIRS} ${DESTDIRS}: if false; then \ for b in $(BITS); do \ for t in $(KOBJ); do \ @@ -124,20 +138,29 @@ ${COMPDIRS} ${INSTDIRS}: hpux_compdirs_libafs: libafs hpux_instdirs_libafs: install_libafs +hpux_destdirs_libafs: dest_libafs # Below this line are targets when in the static directory: LIBAFS = libafs$(BITSUFFIX).a LIBAFSNONFS = libafs$(BITSUFFIX).nonfs.a +INST_LIBAFS = ${DESTDIR}${afskerneldir}/${LIBAFS} +INST_LIBAFSNONFS = ${DESTDIR}${afskerneldir}/${LIBAFSNONFS} -DEST_LIBAFS = ${DESTDIR}/root.client/bin/${LIBAFS} -DEST_LIBAFSNONFS = ${DESTDIR}/root.client/bin/${LIBAFSNONFS} +DEST_LIBAFS = ${DEST}/root.client/bin/${LIBAFS} +DEST_LIBAFSNONFS = ${DEST}/root.client/bin/${LIBAFSNONFS} -# libafs: ${DEST_LIBAFS} ${DEST_LIBAFSNONFS} libafs: ${LIBAFSNONFS} -install_libafs: ${DEST_LIBAFSNONFS} +install_libafs: ${INST_LIBAFSNONFS} +dest_libafs: ${DEST_LIBAFSNONFS} + +$(INST_LIBAFS): $(LIBAFS) + ${INSTALL} -f $? $@ + +$(INST_LIBAFSNONFS): $(LIBAFSNONFS) + ${INSTALL} -f $? $@ $(DEST_LIBAFS): $(LIBAFS) ${INSTALL} -f $? $@ diff --git a/src/libafs/MakefileProto.IRIX.in b/src/libafs/MakefileProto.IRIX.in index 90097ff..a712b12 100644 --- a/src/libafs/MakefileProto.IRIX.in +++ b/src/libafs/MakefileProto.IRIX.in @@ -7,9 +7,22 @@ # MakefileProto for IRIX systems # -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ TOP_SRCDIR=@TOP_SRCDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +afskerneldir=@afskerneldir@ SYS_NAME=@AFS_SYSNAME@ include config/Makefile.${SYS_NAME} @@ -200,6 +213,7 @@ CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${FSINCLUDES} $(DEFINES) -G 0 $(KDEFS) $( # This is the irix multiple directory target. COMPDIRS = irix_compdirs INSTDIRS = irix_instdirs +DESTDIRS = irix_destdirs include Makefile.common @@ -223,7 +237,6 @@ setup: -ln -s /usr/include/net /usr/include/netinet . -ln -s /usr/include/rpc /usr/include/sys . -ln -s /usr/include/sys/fs . - -mkdir ${DESTDIR}/root.client/bin BUILDPROCS="${PROCESSORS}" ; \ BUILDMPS="${MPS}" ; \ @@ -266,7 +279,7 @@ setup: # Compile static and modload versions of the clients. -${COMPDIRS} ${INSTDIRS}: +${COMPDIRS} ${INSTDIRS} ${DESTDIRS}: BUILDPROCS="${PROCESSORS}" ; \ if [ "${CPUARCH}" != "" ] ; then \ BUILDPROCS=${CPUARCH}; \ @@ -316,7 +329,7 @@ ${COMPDIRS} ${INSTDIRS}: done; \ done -${COMPDIRS} ${INSTDIRS}: +${COMPDIRS} ${INSTDIRS} ${DESTDIRS}: BUILDPROCS="${PROCESSORS}" ; \ if [ "${IPNO}" != "" ] ; then \ BUILDPROCS="${IPNO}"; \ @@ -357,69 +370,109 @@ irix_compdirs_STATIC.libafs: STATIC.libafs irix_compdirs_MODLOAD.libafs: MODLOAD.libafs irix_instdirs_STATIC.libafs: install_STATIC.libafs irix_instdirs_MODLOAD.libafs: install_MODLOAD.libafs +irix_destdirs_STATIC.libafs: dest_STATIC.libafs +irix_destdirs_MODLOAD.libafs: dest_MODLOAD.libafs -LIBAFSNONFSA = libafs.nonfs.a -COPYFILES = copyfiles -LINKFILES = linkfiles -${INSTDIRS}: ${COPYFILES} ${LINKFILES} +${INSTDIRS}: install_COPYFILES install_LINKFILES +${DESTDIRS}: dest_COPYFILES dest_LINKFILES + -STATICCLIENTDIR = ${DESTDIR}/root.client/bin -MODLOADCLIENTDIR = ${DESTDIR}/root.client/usr/vice/etc/sgiload -# Make the NFS and no-NFS clients for this directory. -# STATIC.libafs: ${LIBAFSNONFSA} ${COPYFILES} ${LINKFILES} +LIBAFSNONFSA = libafs.nonfs.a + STATIC.libafs: ${LIBAFSNONFSA} + install_STATIC.libafs: ${LIBAFSNONFSA} ${CP} ${LIBAFSNONFSA} \ - ${STATICCLIENTDIR}/libafs.${MPSP}.${CPUARCH}.nonfs.a + ${DESTDIR}${afskerneldir}/libafs.${MPSP}.${CPUARCH}.nonfs.a + + ${CP} ${LIBAFSNONFSA} \ + ${DESTDIR}${afskerneldir}/libafs.${IPNO}.nonfs.a + + +dest_STATIC.libafs: ${LIBAFSNONFSA} + + ${CP} ${LIBAFSNONFSA} \ + ${DEST}/root.client/bin/libafs.${MPSP}.${CPUARCH}.nonfs.a ${CP} ${LIBAFSNONFSA} \ - ${STATICCLIENTDIR}/libafs.${IPNO}.nonfs.a + ${DEST}/root.client/bin/libafs.${IPNO}.nonfs.a ${LIBAFSNONFSA}: $(AFSAOBJS) $(AFSNONFSOBJS) $(AR) cru $@ $? + LIBAFSNONFSO = libafs.nonfs.o # MODLOAD.libafs: ${LIBAFSNONFSO} ${COPYFILES} ${LINKFILES} MODLOAD.libafs: ${LIBAFSNONFSO} + install_MODLOAD.libafs: ${LIBAFSNONFSO} ${CP} ${LIBAFSNONFSO} \ - ${MODLOADCLIENTDIR}/libafs.${MPSP}.${CPUARCH}.nonfs.o + ${DESTDIR}${afskerneldir}/libafs.${MPSP}.${CPUARCH}.nonfs.o ${CP} ${LIBAFSNONFSO} \ - ${MODLOADCLIENTDIR}/libafs.${IPNO}.nonfs.o + ${DESTDIR}${afskerneldir}/libafs.${IPNO}.nonfs.o + + +dest_MODLOAD.libafs: ${LIBAFSNONFSO} + + ${CP} ${LIBAFSNONFSO} \ + ${DESTDIR}/root.client/usr/vice/etc/sgiload/libafs.${MPSP}.${CPUARCH}.nonfs.o + + ${CP} ${LIBAFSNONFSO} \ + ${DESTDIR}/root.client/usr/vice/etc/sgiload/libafs.${IPNO}.nonfs.o ${LIBAFSNONFSO}: $(AFSAOBJS) $(AFSNONFSOBJS) $(LD) ${LDFLAGS} -elf -r -d -G 0 -o ${LIBAFSNONFSO} \ $(AFSAOBJS) $(AFSNONFSOBJS) -${COPYFILES}: - ${CP} sgi_system ${STATICCLIENTDIR}/afs.sm - chmod 644 ${STATICCLIENTDIR}/afs.sm - ${CP} sgi_master ${STATICCLIENTDIR}/afs - chmod 644 ${STATICCLIENTDIR}/afs + +install_COPYFILES: + ${CP} sgi_system ${DESTDIR}${afskerneldir}/afs.sm + chmod 644 ${DESTDIR}${afskerneldir}/afs.sm + ${CP} sgi_master ${DESTDIR}${afskerneldir}/afs + chmod 644 ${DESTDIR}${afskerneldir}/afs + +dest_COPYFILES: + ${CP} sgi_system ${DEST}/root.client/bin/afs.sm + chmod 644 ${DEST}/root.client/bin/afs.sm + ${CP} sgi_master ${DEST}/root.client/bin/afs + chmod 644 ${DEST}/root.client/bin/afs # Create symlinks to clients we don't need to build. # If this changes, also change the kdump symlinks. -${LINKFILES}: +install_LINKFILES: - ln -fs libafs.IP20.a ${DESTDIR}/root.client/bin/libafs.IP22.a - ln -fs libafs.IP20.a ${DESTDIR}/root.client/bin/libafs.IP32.a - ln -fs libafs.IP20.nonfs.a ${DESTDIR}/root.client/bin/libafs.IP22.nonfs.a - ln -fs libafs.IP20.nonfs.a ${DESTDIR}/root.client/bin/libafs.IP32.nonfs.a - ln -fs libafs.IP20.o ${DESTDIR}/root.client/usr/vice/etc/sgiload/libafs.IP22.o - ln -fs libafs.IP20.o ${DESTDIR}/root.client/usr/vice/etc/sgiload/libafs.IP32.o - ln -fs libafs.IP20.nonfs.o ${DESTDIR}/root.client/usr/vice/etc/sgiload/libafs.IP22.nonfs.o - ln -fs libafs.IP20.nonfs.o ${DESTDIR}/root.client/usr/vice/etc/sgiload/libafs.IP32.nonfs.o - - + ln -fs libafs.IP20.a ${DESTDIR}${afskerneldir}/libafs.IP22.a + ln -fs libafs.IP20.a ${DESTDIR}${afskerneldir}/libafs.IP32.a + ln -fs libafs.IP20.nonfs.a ${DESTDIR}${afskerneldir}/libafs.IP22.nonfs.a + ln -fs libafs.IP20.nonfs.a ${DESTDIR}${afskerneldir}/libafs.IP32.nonfs.a + ln -fs libafs.IP20.o ${DESTDIR}${afskerneldir}/libafs.IP22.o + ln -fs libafs.IP20.o ${DESTDIR}${afskerneldir}/libafs.IP32.o + ln -fs libafs.IP20.nonfs.o ${DESTDIR}${afskerneldir}/libafs.IP22.nonfs.o + ln -fs libafs.IP20.nonfs.o ${DESTDIR}${afskerneldir}/libafs.IP32.nonfs.o + + +# Create symlinks to clients we don't need to build. +# If this changes, also change the kdump symlinks. +dest_LINKFILES: + + ln -fs libafs.IP20.a ${DEST}/root.client/bin/libafs.IP22.a + ln -fs libafs.IP20.a ${DEST}/root.client/bin/libafs.IP32.a + ln -fs libafs.IP20.nonfs.a ${DEST}/root.client/bin/libafs.IP22.nonfs.a + ln -fs libafs.IP20.nonfs.a ${DEST}/root.client/bin/libafs.IP32.nonfs.a + ln -fs libafs.IP20.o ${DEST}/root.client/usr/vice/etc/sgiload/libafs.IP22.o + ln -fs libafs.IP20.o ${DEST}/root.client/usr/vice/etc/sgiload/libafs.IP32.o + ln -fs libafs.IP20.nonfs.o ${DEST}/root.client/usr/vice/etc/sgiload/libafs.IP22.nonfs.o + ln -fs libafs.IP20.nonfs.o ${DEST}/root.client/usr/vice/etc/sgiload/libafs.IP32.nonfs.o + # Object build rules: diff --git a/src/libafs/MakefileProto.LINUX.in b/src/libafs/MakefileProto.LINUX.in index d31ee5c..99b4589 100644 --- a/src/libafs/MakefileProto.LINUX.in +++ b/src/libafs/MakefileProto.LINUX.in @@ -7,9 +7,22 @@ # MakefileProto for Linux i386 systems # -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ TOP_SRCDIR=@TOP_SRCDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +afskerneldir=@afskerneldir@ SYS_NAME=@AFS_SYSNAME@ include config/Makefile.${SYS_NAME} @@ -84,6 +97,7 @@ MPS = @MPS@ # COMPDIRS is called in Makefile.common to do the actual builds. COMPDIRS=linux_compdirs INSTDIRS=linux_instdirs +DESTDIRS=linux_destdirs include Makefile.common @@ -105,7 +119,7 @@ setup: # Compile SP and MP clients as requested -${COMPDIRS} ${INSTDIRS}: +${COMPDIRS} ${INSTDIRS} ${DESTDIRS}: $(RM) -f h ln -s ${LINUX_KERNEL_PATH}/include/linux h $(RM) -f linux @@ -145,7 +159,7 @@ ${COMPDIRS} ${INSTDIRS}: TARG=libafs ; \ fi ; \ cd $${KDIR} ; \ - $(MAKE) SMP_DEF="$${SMP_DEF}" $${TARG} CLIENT=${LINUX_VERS}${LINUX_MODULE_NAME} || exit $$?; \ + $(MAKE) SMP_DEF="$${SMP_DEF}" $@_$${TARG} CLIENT=${LINUX_VERS}${LINUX_MODULE_NAME} || exit $$?; \ cd ../ ; \ done @@ -153,6 +167,8 @@ linux_compdirs_libafs: libafs linux_compdirs_libafs.mp: libafs.mp linux_instdirs_libafs: install_libafs linux_instdirs_libafs.mp: install_libafs.mp +linux_destdirs_libafs: dest_libafs +linux_destdirs_libafs.mp: dest_libafs.mp # Below this line are targets when in the COMMON directory: @@ -160,8 +176,11 @@ linux_instdirs_libafs.mp: install_libafs.mp LIBAFS = libafs-${CLIENT}.o LIBAFS_MP = libafs-${CLIENT}.mp.o -DEST_LIBAFS = ${DESTDIR}/root.client/usr/vice/etc/modload/${LIBAFS} -DEST_LIBAFS_MP = ${DESTDIR}/root.client/usr/vice/etc/modload/${LIBAFS_MP} +INST_LIBAFS = ${DESTDIR}${afskerneldir}/${LIBAFS} +INST_LIBAFS_MP = ${DESTDIR}${afskerneldir}/${LIBAFS_MP} + +DEST_LIBAFS = ${DEST}/root.client/usr/vice/etc/modload/${LIBAFS} +DEST_LIBAFS_MP = ${DEST}/root.client/usr/vice/etc/modload/${LIBAFS_MP} libafs: $(LIBAFS) @@ -178,12 +197,24 @@ ${LIBAFS_MP}: $(AFSAOBJS) $(AFSNONFSOBJS) $(RM) -f $@ $(LD) -r -o $@ $(AFSAOBJS) $(AFSNONFSOBJS) -install_libafs: $(DEST_LIBAFS) +install_libafs: $(INST_LIBAFS) + echo SP Install Complete + +install_libafs.mp: $(INST_LIBAFS_MP) + echo MP Install Complete + +dest_libafs: $(DEST_LIBAFS) echo SP Install Complete -install_libafs.mp: $(DEST_LIBAFS_MP) +dest_libafs.mp: $(DEST_LIBAFS_MP) echo MP Install Complete +$(INST_LIBAFS): $(LIBAFS) + ${INSTALL} -f $? $@ + +$(INST_LIBAFS_MP): $(LIBAFS_MP) + ${INSTALL} -f $? $@ + $(DEST_LIBAFS): $(LIBAFS) ${INSTALL} -f $? $@ diff --git a/src/libafs/MakefileProto.SOLARIS.in b/src/libafs/MakefileProto.SOLARIS.in index 4a93927..d0feffa 100644 --- a/src/libafs/MakefileProto.SOLARIS.in +++ b/src/libafs/MakefileProto.SOLARIS.in @@ -7,9 +7,22 @@ # MakefileProto for Solaris systems # -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ TOP_SRCDIR=@TOP_SRCDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +afskerneldir=@afskerneldir@ SYS_NAME=@AFS_SYSNAME@ include config/Makefile.${SYS_NAME} @@ -57,10 +70,12 @@ KOBJ = MODLOAD32 MODLOAD64 COMPDIRS = single_compdir INSTDIRS = single_instdir +DESTDIRS = single_destdir COMPDIRS = solaris_compdirs INSTDIRS = solaris_instdirs +DESTDIRS = solaris_destdirs include Makefile.common @@ -90,7 +105,7 @@ setup: ## the 64 bit libafs in MODLOAD32 and MODLOAD64 directories respectively -${COMPDIRS} ${INSTDIRS}: +${COMPDIRS} ${INSTDIRS} ${DESTDIRS}: for t in ${KOBJ} ; do \ echo Building directory: $$t ; \ case $$t in \ @@ -110,6 +125,7 @@ ${COMPDIRS} ${INSTDIRS}: solaris_compdirs_libafs: libafs solaris_instdirs_libafs: install_libafs +solaris_destdirs_libafs: dest_libafs @@ -118,16 +134,25 @@ LIBAFS = libafs.o LIBAFSNONFS = libafs.nonfs.o -DEST_LIBAFS = ${DESTDIR}/root.client/usr/vice/etc/modload/${LIBAFS} -DEST_LIBAFSNONFS = ${DESTDIR}/root.client/usr/vice/etc/modload/${LIBAFSNONFS} +INST_LIBAFS = ${DESTDIR}${afskerneldir}/${LIBAFS} +INST_LIBAFSNONFS = ${DESTDIR}${afskerneldir}/${LIBAFSNONFS} + +DEST_LIBAFS = ${DEST}/root.client/usr/vice/etc/modload/${LIBAFS} +DEST_LIBAFSNONFS = ${DEST}/root.client/usr/vice/etc/modload/${LIBAFSNONFS} # Without this line, gmake tries to build libafs.o .PHONY: libafs -# libafs: $(DEST_LIBAFS) $(DEST_LIBAFSNONFS) libafs: $(LIBAFSNONFS) -install_libafs: $(DEST_LIBAFSNONFS) +install_libafs: $(INST_LIBAFSNONFS) +dest_libafs: $(DEST_LIBAFSNONFS) + +$(INST_LIBAFS): $(LIBAFS) + ${INSTALL} -f $? $@ + +$(INST_LIBAFSNONFS): $(LIBAFSNONFS) + ${INSTALL} -f $? $@ $(DEST_LIBAFS): $(LIBAFS) ${INSTALL} -f $? $@ @@ -145,11 +170,14 @@ ${LIBAFSNONFS}: $(AFSAOBJS) $(AFSNONFSOBJS) $(LD) -r -o $@ $(AFSAOBJS) ${AFSNONFSOBJS} -MODLOADDIR = ${DESTDIR}/root.client/usr/vice/etc/modload libafs: ${LIBAFSNONFS} + install_libafs: ${LIBAFSNONFS} - ${INSTALL} -f ${LIBAFSNONFS} ${MODLOADDIR}/libafs${BITS}.nonfs.o + ${INSTALL} -f ${LIBAFSNONFS} ${DESTDIR}${afskerneldir}/libafs${BITS}.nonfs.o + +dest_libafs: ${LIBAFSNONFS} + ${INSTALL} -f ${LIBAFSNONFS} ${DEST}/root.client/usr/vice/etc/libafs${BITS}.nonfs.o diff --git a/src/libafsauthent/Makefile.in b/src/libafsauthent/Makefile.in index 5cb8712..e5d547f 100644 --- a/src/libafsauthent/Makefile.in +++ b/src/libafsauthent/Makefile.in @@ -7,8 +7,22 @@ # This is a pthread safe library containing ubikclient, auth, kauth. -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -17,7 +31,7 @@ SHELL = /bin/sh include ../config/Makefile.${SYS_NAME} CC=${MT_CC} -CFLAGS = ${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${MT_CFLAGS} +CFLAGS=${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${MT_CFLAGS} CCRULE = ${CC} ${CFLAGS} -c $? AUDIT= ../audit @@ -94,10 +108,12 @@ LIBOBJS = \ ${PTSERVEROBJS} \ ${SYSOBJS} -system install: ${DESTDIR}/lib/libafsauthent.a +all: ${TOP_LIBDIR}/libafsauthent.a -${DESTDIR}/lib/libafsauthent.a: libafsauthent.a - ${INSTALL} libafsauthent.a ${DESTDIR}/lib/libafsauthent.a +install: ${DESTDIR}${libdir}/libafsauthent.a + +${DEST}/lib/libafsauthent.a: libafsauthent.a + ${INSTALL} $? $@ libafsauthent.a: ${LIBOBJS} $(RM) -f $@ @@ -242,3 +258,12 @@ rmtsysnet.o: ${SYS}/rmtsysnet.c clean: $(RM) -f *.o *.a libafsauthent* + +${DESTDIR}${libdir}/libafsauthent.a: libafsauthent.a + ${INSTALL} $? $@ + +${TOP_LIBDIR}/libafsauthent.a: libafsauthent.a + ${INSTALL} $? $@ + +dest: ${DEST}/lib/libafsauthent.a + diff --git a/src/libafsrpc/Makefile.in b/src/libafsrpc/Makefile.in index 96ec1a0..8e502b4 100644 --- a/src/libafsrpc/Makefile.in +++ b/src/libafsrpc/Makefile.in @@ -7,8 +7,22 @@ # This is a pthread safe library containing rx, rxkad and des. -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -17,9 +31,9 @@ SHELL = /bin/sh include ../config/Makefile.${SYS_NAME} CC=${MT_CC} -INCLUDES = -I${SRCDIR}/include -I.. -I../rx +INCLUDES=-I${TOP_INCDIR} -I.. -I../rx CFLAGS = ${OPTMZ} ${DBG} ${INCLUDES} -DRXDEBUG ${MT_CFLAGS} -I${TOP_SRCDIR}/config -SFLAGS=-P -I${SRCDIR}/include +SFLAGS=-P -I${TOP_INCDIR} RX = ../rx CCRULE = ${CC} ${CFLAGS} -c $? RXKAD = ../rxkad @@ -114,10 +128,12 @@ LIBOBJS = \ ${RXSTATOBJS} \ ${FSINTOBJS} -system install: ${DESTDIR}/lib/libafsrpc.a +all: ${TOP_LIBDIR}/libafsrpc.a -${DESTDIR}/lib/libafsrpc.a: libafsrpc.a - ${INSTALL} libafsrpc.a ${DESTDIR}/lib/libafsrpc.a +install: ${DESTDIR}${libdir}/libafsrpc.a + +${DEST}/lib/libafsrpc.a: libafsrpc.a + ${INSTALL} $? $@ libafsrpc.a: ${LIBOBJS} $(RM) -f $@ @@ -362,3 +378,11 @@ afsaux.o: ${FSINT}/afsaux.c clean: $(RM) -f *.o libafsrpc* +${DESTDIR}${libdir}/libafsrpc.a: libafsrpc.a + ${INSTALL} $? $@ + +${TOP_LIBDIR}/libafsrpc.a: libafsrpc.a + ${INSTALL} $? $@ + +dest: ${DEST}/lib/libafsrpc.a + diff --git a/src/libuafs/Makefile.common b/src/libuafs/Makefile.common index fcab8c6..bb8fe04 100644 --- a/src/libuafs/Makefile.common +++ b/src/libuafs/Makefile.common @@ -21,28 +21,30 @@ NS_INCL =SRC/../afsweb/netscape_includes # Build rules - CC and CFLAGS are defined in system specific MakefileProtos. -install: ukinstall +all: ${TOP_LIBDIR}/$(LIBUAFS) linktest -webinstall: AFSWEB/$(LIBAFSWEB) AFSWEB/$(LIBAFSWEBKRB) - ${INSTALL} AFSWEB/$(LIBAFSWEB) ${DESTDIR}/root.afsweb/usr/lib - ${INSTALL} AFSWEB/$(LIBAFSWEBKRB) ${DESTDIR}/root.afsweb/usr/lib +webinstall: all \ + ${TOP_LIBDIR}/$(LIBAFSWEB) \ + ${TOP_LIBDIR}/$(LIBAFSWEBKRB) -ukinsthdrs: - ${INSTALL} afs/param.h ${DESTDIR}/root.perf/include/afs - ${INSTALL} afs/stds.h ${DESTDIR}/root.perf/include/afs - ${INSTALL} afs/afs_sysnames.h ${DESTDIR}/root.perf/include/afs - ${INSTALL} afs/afs_stats.h ${DESTDIR}/root.perf/include/afs - ${INSTALL} afs/sysincludes.h ${DESTDIR}/root.perf/include/afs - ${INSTALL} afs/afs_usrops.h ${DESTDIR}/root.perf/include/afs +linktest: UAFS/$(LIBUAFS) des/libdes.a + $(CC) $(TEST_CFLAGS) $(TEST_LDFLAGS) -o linktest linktest.c -I${TOP_SRCDIR}/config -I${TOP_INCDIR} -I${TOP_INCDIR}/rx -I. UAFS/$(LIBUAFS) des/libdes.a $(TEST_LIBS) $(XLIBS) -ukinstlibs: - ${INSTALL} des/libdes.a ${DESTDIR}/root.perf/lib - ${INSTALL} UAFS/$(LIBUAFS) ${DESTDIR}/root.perf/lib +ukinstall: install -ukinstall: ukinsthdrs UAFS/$(LIBUAFS) linktest ukinstlibs +install: \ + ${DESTDIR}${libdir}/$(LIBUAFS) + +dest: \ + ${DEST}/root.perf/include/afs/param.h \ + ${DEST}/root.perf/include/afs/stds.h \ + ${DEST}/root.perf/include/afs/afs_sysnames.h \ + ${DEST}/root.perf/include/afs/afs_stats.h \ + ${DEST}/root.perf/include/afs/sysincludes.h \ + ${DEST}/root.perf/include/afs/afs_usrops.h \ + ${DEST}/root.perf/lib/libdes.a \ + ${DEST}/root.perf/lib/$(LIBUAFS) -linktest: UAFS/$(LIBUAFS) des/libdes.a - $(CC) $(TEST_CFLAGS) $(TEST_LDFLAGS) -o linktest linktest.c -I${TOP_SRCDIR}/config -I${DESTDIR}/include -I${DESTDIR}/include/rx -I${DESTDIR}/root.perf/include UAFS/$(LIBUAFS) des/libdes.a $(TEST_LIBS) $(XLIBS) CRULE1= $(CC) $(OPTF) -DKERNEL $(CFLAGS) -c $? CRULE2= $(CC) $(OPTF) $(WEBOPTS) -DKERNEL $(CFLAGS) -c $? @@ -892,3 +894,53 @@ clean: -$(RM) -rf UAFS* AFSWEB* nsapi des afs afsint config rx -$(RM) -f h net netinet rpc ufs machine inet nfs sys des linktest + +${TOP_LIBDIR}/$(LIBAFSWEB): AFSWEB/$(LIBAFSWEB) + ${INSTALL} $? $@ + +${TOP_LIBDIR}/$(LIBAFSWEBKRB): AFSWEB/$(LIBAFSWEBKRB) + ${INSTALL} $? $@ + +${TOP_LIBDIR}/$(LIBUAFS): UAFS/$(LIBUAFS) + ${INSTALL} $? $@ + + +${DESTDIR}${libdir}/$(LIBAFSWEB): AFSWEB/$(LIBAFSWEB) + ${INSTALL} $? $@ + +${DESTDIR}${libdir}/$(LIBAFSWEBKRB): AFSWEB/$(LIBAFSWEBKRB) + ${INSTALL} $? $@ + +${DESTDIR}${libdir}/$(LIBUAFS): UAFS/$(LIBUAFS) + ${INSTALL} $? $@ + + +${DEST}/root.afsweb/usr/lib/$(LIBAFSWEB): AFSWEB/$(LIBAFSWEB) + ${INSTALL} $? $@ + +${DEST}/root.afsweb/usr/lib/$(LIBAFSWEBKRB): AFSWEB/$(LIBAFSWEBKRB) + ${INSTALL} $? $@ + +${DEST}/root.perf/include/afs/param.h: afs/param.h + ${INSTALL} $? $@ + +${DEST}/root.perf/include/afs/stds.h: afs/stds.h + ${INSTALL} $? $@ + +${DEST}/root.perf/include/afs/afs_sysnames.h: afs/afs_sysnames.h + ${INSTALL} $? $@ + +${DEST}/root.perf/include/afs/afs_stats.h: afs/afs_stats.h + ${INSTALL} $? $@ + +${DEST}/root.perf/include/afs/sysincludes.h: afs/sysincludes.h + ${INSTALL} $? $@ + +${DEST}/root.perf/include/afs/afs_usrops.h: afs/afs_usrops.h + ${INSTALL} $? $@ + +${DEST}/root.perf/lib/libdes.a: des/libdes.a + ${INSTALL} $? $@ + +${DEST}/root.perf/lib/$(LIBUAFS): UAFS/$(LIBUAFS) + ${INSTALL} $? $@ diff --git a/src/libuafs/MakefileProto.AIX.in b/src/libuafs/MakefileProto.AIX.in index 93a1748..be37a49 100644 --- a/src/libuafs/MakefileProto.AIX.in +++ b/src/libuafs/MakefileProto.AIX.in @@ -8,9 +8,21 @@ # MakefileProto for AIX systems # -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ TOP_SRCDIR=@TOP_SRCDIR@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ SYS_NAME=@AFS_SYSNAME@ include ../config/Makefile.${SYS_NAME} diff --git a/src/libuafs/MakefileProto.DARWIN.in b/src/libuafs/MakefileProto.DARWIN.in index eaba8dc..8931b19 100644 --- a/src/libuafs/MakefileProto.DARWIN.in +++ b/src/libuafs/MakefileProto.DARWIN.in @@ -8,9 +8,21 @@ # MakefileProto for Solaris systems # -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ TOP_SRCDIR=@TOP_SRCDIR@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ SYS_NAME=@AFS_SYSNAME@ include ../config/Makefile.${SYS_NAME} diff --git a/src/libuafs/MakefileProto.DUX.in b/src/libuafs/MakefileProto.DUX.in index d89e6cf..24f3bfc 100644 --- a/src/libuafs/MakefileProto.DUX.in +++ b/src/libuafs/MakefileProto.DUX.in @@ -8,9 +8,21 @@ # MakefileProto for Solaris systems # -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ TOP_SRCDIR=@TOP_SRCDIR@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ SYS_NAME=@AFS_SYSNAME@ DBUG=-O diff --git a/src/libuafs/MakefileProto.FBSD.in b/src/libuafs/MakefileProto.FBSD.in index 4a9c6d3..e597b89 100644 --- a/src/libuafs/MakefileProto.FBSD.in +++ b/src/libuafs/MakefileProto.FBSD.in @@ -2,9 +2,21 @@ # # MakefileProto for Solaris systems # -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ TOP_SRCDIR=@TOP_SRCDIR@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ SYS_NAME=@AFS_SYSNAME@ include ../config/Makefile.${SYS_NAME} diff --git a/src/libuafs/MakefileProto.HPUX.in b/src/libuafs/MakefileProto.HPUX.in index cf2b93a..0057b01 100644 --- a/src/libuafs/MakefileProto.HPUX.in +++ b/src/libuafs/MakefileProto.HPUX.in @@ -8,9 +8,21 @@ # MakefileProto for HP-UX systems # -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ TOP_SRCDIR=@TOP_SRCDIR@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ SYS_NAME=@AFS_SYSNAME@ include ../config/Makefile.${SYS_NAME} diff --git a/src/libuafs/MakefileProto.IRIX.in b/src/libuafs/MakefileProto.IRIX.in index 949a95b..a078593 100644 --- a/src/libuafs/MakefileProto.IRIX.in +++ b/src/libuafs/MakefileProto.IRIX.in @@ -8,9 +8,21 @@ # MakefileProto for Solaris systems # -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ TOP_SRCDIR=@TOP_SRCDIR@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ SYS_NAME=@AFS_SYSNAME@ include ../config/Makefile.${SYS_NAME} diff --git a/src/libuafs/MakefileProto.LINUX.in b/src/libuafs/MakefileProto.LINUX.in index 939f97c..0e65b33 100644 --- a/src/libuafs/MakefileProto.LINUX.in +++ b/src/libuafs/MakefileProto.LINUX.in @@ -8,9 +8,21 @@ # MakefileProto for Solaris systems # -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ TOP_SRCDIR=@TOP_SRCDIR@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ SYS_NAME=@AFS_SYSNAME@ include ../config/Makefile.${SYS_NAME} diff --git a/src/libuafs/MakefileProto.SOLARIS.in b/src/libuafs/MakefileProto.SOLARIS.in index 725adc9..d95d14f 100644 --- a/src/libuafs/MakefileProto.SOLARIS.in +++ b/src/libuafs/MakefileProto.SOLARIS.in @@ -8,9 +8,21 @@ # MakefileProto for Solaris systems # -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ TOP_SRCDIR=@TOP_SRCDIR@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ SYS_NAME=@AFS_SYSNAME@ include ../config/Makefile.${SYS_NAME} diff --git a/src/log/Makefile.in b/src/log/Makefile.in index d426fa3..31ca5ba 100644 --- a/src/log/Makefile.in +++ b/src/log/Makefile.in @@ -5,42 +5,56 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ include ../config/Makefile.${SYS_NAME} -INCDIRS= -I${TOP_SRCDIR}/config -I${DESTDIR}/include -I${DESTDIR}/include/afs +INCDIRS=-I${TOP_SRCDIR}/config -I${TOP_INCDIR} -I${TOP_INCDIR}/afs CFLAGS = ${OPTMZ} ${INCDIRS} ${XCFLAGS} ${DBUG} PROGRAMS= unlog tokens tokens.krb kseal -INCLS=${SRCDIR}/include/afs/auth.h ${SRCDIR}/include/rx/rx.h \ -${SRCDIR}/include/rx/xdr.h ${SRCDIR}/include/des.h ${SRCDIR}/include/rx/rxkad.h \ -${SRCDIR}/include/afs/cellconfig.h - -LIBRARIES= ${SRCDIR}/lib/afs/libauth.a \ - ${SRCDIR}/lib/librxkad.a \ - ${SRCDIR}/lib/libdes.a \ - ${SRCDIR}/lib/afs/libsys.a ${SRCDIR}/lib/librx.a \ - ${SRCDIR}/lib/afs/libsys.a \ - ${SRCDIR}/lib/liblwp.a ${SRCDIR}/lib/afs/libcmd.a \ - ${SRCDIR}/lib/afs/util.a -KLIBRARIES= ${SRCDIR}/lib/afs/libauth.krb.a \ - ${SRCDIR}/lib/librxkad.a \ - ${SRCDIR}/lib/libdes.a \ - ${SRCDIR}/lib/afs/libsys.a ${SRCDIR}/lib/librx.a \ - ${SRCDIR}/lib/afs/libsys.a \ - ${SRCDIR}/lib/liblwp.a ${SRCDIR}/lib/afs/libcmd.a \ - ${SRCDIR}/lib/afs/util.a +INCLS=${TOP_INCDIR}/afs/auth.h ${TOP_INCDIR}/rx/rx.h \ +${TOP_INCDIR}/rx/xdr.h ${TOP_INCDIR}/des.h ${TOP_INCDIR}/rx/rxkad.h \ +${TOP_INCDIR}/afs/cellconfig.h + +LIBRARIES=${TOP_LIBDIR}/libauth.a \ + ${TOP_LIBDIR}/librxkad.a \ + ${TOP_LIBDIR}/libdes.a \ + ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/librx.a \ + ${TOP_LIBDIR}/libsys.a \ + ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/libcmd.a \ + ${TOP_LIBDIR}/util.a +KLIBRARIES=${TOP_LIBDIR}/libauth.krb.a \ + ${TOP_LIBDIR}/librxkad.a \ + ${TOP_LIBDIR}/libdes.a \ + ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/librx.a \ + ${TOP_LIBDIR}/libsys.a \ + ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/libcmd.a \ + ${TOP_LIBDIR}/util.a # # Main targets # -all: install +all: unlog tokens tokens.krb kseal # # Build targets @@ -65,34 +79,35 @@ tokens.krb: tokens.o ${KLIBRARIES} kseal.o: kseal.c ${INCLS} AFS_component_version_number.c unlog.o: unlog.c AFS_component_version_number.c -tokens.o: tokens.c ${SRCDIR}/include/rx/xdr.h AFS_component_version_number.c +tokens.o: tokens.c ${TOP_INCDIR}/rx/xdr.h AFS_component_version_number.c # # Install targets # -install: ${DESTDIR}/bin/unlog \ - ${DESTDIR}/bin/tokens \ - ${DESTDIR}/bin/tokens.krb \ - ${DESTDIR}/root.server/usr/afs/bin/tokens \ - ${DESTDIR}/root.server/usr/afs/bin/tokens.krb \ - ${DESTDIR}/etc/kseal - -${DESTDIR}/bin/unlog: unlog +install: \ + ${DESTDIR}${bindir}/unlog \ + ${DESTDIR}${bindir}/tokens \ + ${DESTDIR}${bindir}/tokens.krb \ + ${DESTDIR}${afssrvbindir}/tokens \ + ${DESTDIR}${afssrvbindir}/tokens.krb \ + ${DESTDIR}${sbindir}/kseal + +${DEST}/bin/unlog: unlog ${INSTALL} $? $@ -${DESTDIR}/bin/tokens: tokens +${DEST}/bin/tokens: tokens ${INSTALL} $? $@ -${DESTDIR}/bin/tokens.krb: tokens.krb +${DEST}/bin/tokens.krb: tokens.krb ${INSTALL} $? $@ -${DESTDIR}/root.server/usr/afs/bin/tokens: tokens +${DEST}/root.server/usr/afs/bin/tokens: tokens ${INSTALL} $? $@ -${DESTDIR}/root.server/usr/afs/bin/tokens.krb: tokens.krb +${DEST}/root.server/usr/afs/bin/tokens.krb: tokens.krb ${INSTALL} $? $@ -${DESTDIR}/etc/kseal: kseal +${DEST}/etc/kseal: kseal ${INSTALL} $? $@ # @@ -106,3 +121,29 @@ test: include ../config/Makefile.version +${DESTDIR}${bindir}/unlog: unlog + ${INSTALL} $? $@ + +${DESTDIR}${bindir}/tokens: tokens + ${INSTALL} $? $@ + +${DESTDIR}${bindir}/tokens.krb: tokens.krb + ${INSTALL} $? $@ + +${DESTDIR}${afssrvbindir}/tokens: tokens + ${INSTALL} $? $@ + +${DESTDIR}${afssrvbindir}/tokens.krb: tokens.krb + ${INSTALL} $? $@ + +${DESTDIR}${sbindir}/kseal: kseal + ${INSTALL} $? $@ + +dest: \ + ${DEST}/bin/unlog \ + ${DEST}/bin/tokens \ + ${DEST}/bin/tokens.krb \ + ${DEST}/root.server/usr/afs/bin/tokens \ + ${DEST}/root.server/usr/afs/bin/tokens.krb \ + ${DEST}/etc/kseal + diff --git a/src/log/test/Makefile.in b/src/log/test/Makefile.in index f893364..676b27f 100644 --- a/src/log/test/Makefile.in +++ b/src/log/test/Makefile.in @@ -5,22 +5,36 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ OPTIMIZE=-O -INCDIRS= -I${DESTDIR}/include -I.. -I${DESTDIR}/include/afs -LDIRS= -L${DESTDIR}/lib -L${DESTDIR}/lib/afs -L.. +INCDIRS=-I${TOP_INCDIR} -I.. -I${TOP_INCDIR}/afs +LDIRS=-L${TOP_LIBDIR} -L${DESTDIR}/lib/afs -L.. LIBS= -lauth -lrxkad -ldes -lsys -lrx -llwp -lcmd -lafsutil ${XLIBS} CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS} -all: install +all: testlog gettoktest -install: testlog gettoktest +install: # # Build targets @@ -37,3 +51,5 @@ gettoktest: gettoktest.o clean: $(RM) -f *.o testlog gettoktest core +dest: + diff --git a/src/login/Makefile.in b/src/login/Makefile.in index 85e534a..1a67c6c 100644 --- a/src/login/Makefile.in +++ b/src/login/Makefile.in @@ -17,24 +17,43 @@ # @(#)Makefile 5.1 (Berkeley) 10/18/88 # -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ include ../config/Makefile.${SYS_NAME} -LIBDIR = ${DESTDIR}/lib/ -AFSLIBS = ${LIBDIR}/afs/libkauth.a ${LIBDIR}/afs/libprot.a ${LIBDIR}/libubik.a \ - ${LIBDIR}/afs/libauth.a ${DESTDIR}/lib/librxkad.a ${LIBDIR}/afs/libsys.a \ - ${DESTDIR}/lib/libdes.a ${LIBDIR}/librx.a ${LIBDIR}/liblwp.a \ - ${LIBDIR}/afs/libcmd.a ${LIBDIR}/afs/libcom_err.a ${LIBDIR}/afs/util.a -KAFSLIBS = ${LIBDIR}/afs/libkauth.krb.a ${LIBDIR}/afs/libprot.a ${LIBDIR}/libubik.a \ - ${LIBDIR}/afs/libauth.krb.a ${DESTDIR}/lib/librxkad.a ${LIBDIR}/afs/libsys.a \ - ${DESTDIR}/lib/libdes.a ${LIBDIR}/librx.a ${LIBDIR}/liblwp.a \ - ${LIBDIR}/afs/libcmd.a ${LIBDIR}/afs/libcom_err.a ${LIBDIR}/afs/util.a -INCLUDES = -I${TOP_SRCDIR}/config -I${DESTDIR}/include -I/usr/include -I/usr/include/sys +AFSLIBS = ${TOP_LIBDIR}/libkauth.a ${TOP_LIBDIR}/libprot.a \ + ${TOP_LIBDIR}/libubik.a ${TOP_LIBDIR}/libauth.a \ + ${TOP_LIBDIR}/librxkad.a ${TOP_LIBDIR}/libsys.a \ + ${TOP_LIBDIR}/libdes.a ${TOP_LIBDIR}/librx.a \ + ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/libcmd.a \ + ${TOP_LIBDIR}/afs/libcom_err.a ${TOP_LIBDIR}/afs/util.a + +KAFSLIBS = ${TOP_LIBDIR}/libkauth.krb.a ${TOP_LIBDIR}/libprot.a \ + ${TOP_LIBDIR}/libubik.a ${TOP_LIBDIR}/libauth.krb.a \ + ${TOP_LIBDIR}/librxkad.a ${TOP_LIBDIR}/libsys.a \ + ${TOP_LIBDIR}/libdes.a ${TOP_LIBDIR}/librx.a \ + ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/libcmd.a \ + ${TOP_LIBDIR}/libcom_err.a ${TOP_LIBDIR}/util.a + +INCLUDES=-I${TOP_SRCDIR}/config -I${TOP_INCDIR} -I/usr/include -I/usr/include/sys CFLAGS= -g ${XCFLAGS} ${INCLUDES} LIBC= /lib/libc.a SRCS= login.c @@ -44,7 +63,6 @@ LIBS= ${AFSLIBS} KLIBS= ${KAFSLIBS} SLIBS= ${AFSLIBS} ${LIBC} SKLIBS= ${KAFSLIBS} ${LIBC} -MAN= UTILOBJS = util_login.o util_logout.o util_logwtmp.o include ../config/Makefile.version @@ -84,8 +102,21 @@ cleandir: clean depend: ${SRCS} mkdep -p ${CFLAGS} ${SRCS} -install: ${MAN} all - ${INSTALL} -s login ${DESTDIR}/bin/login - ${INSTALL} -s login.krb ${DESTDIR}/bin/login.krb +install: ${DESTDIR}${bindir}/login ${DESTDIR}${bindir}/login.krb + +${DEST}/bin/login: login + ${INSTALL} $? $@ + +${DESTDIR}${bindir}/login: login + ${INSTALL} $? $@ + + +${DEST}/bin/login.krb: login.krb + ${INSTALL} $? $@ + +${DESTDIR}${bindir}/login.krb: login.krb + ${INSTALL} $? $@ + + +dest: ${DEST}/bin/login ${DEST}/bin/login.krb -system: install diff --git a/src/lwp/Makefile.in b/src/lwp/Makefile.in index b809d5a..553460a 100644 --- a/src/lwp/Makefile.in +++ b/src/lwp/Makefile.in @@ -5,8 +5,22 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -18,12 +32,12 @@ include ../config/Makefile.${SYS_NAME} # subtle bugs that may have been introduced in process.s, be warned! OPTIMIZE=${LWP_OPTMZ} -CFLAGS=${OPTIMIZE} -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS} +CFLAGS=${OPTIMIZE} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} LIBOBJS=lwp.o process.o lock.o iomgr.o timer.o fasttime.o preempt.o \ waitkey.o threadname.o AFS_component_version_number.o -all: install +all: ${TOP_LIBDIR}/liblwp.a ${TOP_INCDIR}/lock.h ${TOP_INCDIR}/lwp.h ${TOP_INCDIR}/preempt.h ${TOP_INCDIR}/timer.h # # Build rules @@ -34,27 +48,27 @@ liblwp.a: ${LIBOBJS} $(RANLIB) $@ process.s: - # This is required so sgi_64+ does not try to build this file. echo Nothing to be done for process.s + # This is required so sgi_64+ does not try to build this file. process.o : process.s process.c @case "$(SYS_NAME)" in \ pmax_he1) \ - $(CC) -c -I${SRCDIR}/include process.s;; \ + $(CC) -c -I${TOP_INCDIR} process.s;; \ sun4c_51 | sun4c_52 | sun4m_51 | sun4m_52 | sun4c_53 | sun4m_53 | sun4_53 | sun4_52 | sun4_54 | sun4c_54 | sun4m_54 | sun4x_5? | sunx86_54) \ - /usr/ccs/lib/cpp -P -I${SRCDIR}/include process.s process.ss; \ + /usr/ccs/lib/cpp -P -I${TOP_INCDIR} process.s process.ss; \ ${AS} process.ss -o process.o; \ $(RM) process.ss ;; \ sgi_5* ) \ - $(CC) -c -I${SRCDIR}/include -KPIC -G0 process.s;; \ + $(CC) -c -I${TOP_INCDIR} -KPIC -G0 process.s;; \ sgi_61 | sgi_62 | sgi_63 ) \ - $(CC) -c ${XCFLAGS} -I${SRCDIR}/include -KPIC -G0 process.s;; \ + $(CC) -c ${XCFLAGS} -I${TOP_INCDIR} -KPIC -G0 process.s;; \ s390*) \ - /lib/cpp -P -I${SRCDIR}/include process.s >process.ss; \ + /lib/cpp -P -I${TOP_INCDIR} process.s >process.ss; \ ${AS} -ahlns process.ss -o process.o >process.lst; \ $(RM) process.ss ;; \ ppc_darwin* ) \ - $(CC) -c ${XCFLAGS} -I${SRCDIR}/include process.s;; \ + $(CC) -c ${XCFLAGS} -I${TOP_INCDIR} process.s;; \ i386_fbsd* ) \ /usr/bin/cpp -P process.fbsd.s > process.ss; \ ${AS} -o process.o process.ss; \ @@ -62,16 +76,16 @@ process.o : process.s process.c hp* | *_linux* | sgi_64 | sgi_65 ) \ ${CC} ${CFLAGS} -c process.c;; \ ncrx86_*) \ - /usr/ccs/lib/cpp -P -I${SRCDIR}/include process.s process.ss; \ + /usr/ccs/lib/cpp -P -I${TOP_INCDIR} process.s process.ss; \ ${AS} -o process.o process.ss; \ $(RM) process.ss ;; \ alpha_osf1 | alpha_osf20 | alpha_osf30 | alpha_osf32 | alpha_osf32c | alpha_dux?? ) \ - ${AS} -v -P -DOSF -I${SRCDIR}/include -DASSEMBLER process.s; \ + ${AS} -v -P -DOSF -I${TOP_INCDIR} -DASSEMBLER process.s; \ ${AS} -v process.i -o process.o;; \ hp_ux110 ) \ ${CC} ${CFLAGS} -c process.c;; \ *) \ - /lib/cpp -P -I${SRCDIR}/include process.s process.ss; \ + /lib/cpp -P -I${TOP_INCDIR} process.s process.ss; \ ${AS} process.ss -o process.o; \ $(RM) process.ss ;; \ esac @@ -83,7 +97,7 @@ preempt.o : preempt.c lwp.h preempt.h lwp.o : lwp.c lwp.h case "$(SYS_NAME)" in \ rs_aix*) \ - $(CC) -I${TOP_SRCDIR}/config -I${SRCDIR}/include -c lwp.c;; \ + $(CC) -I${TOP_SRCDIR}/config -I${TOP_INCDIR} -c lwp.c;; \ *) \ $(CC) ${CFLAGS} -c lwp.c;; \ esac @@ -97,8 +111,8 @@ exc_handling.o : exc_handling.c # # tests # -rw: rw.o liblwp.a $(DESTDIR)/lib/afs/util.a - ${CC} ${CFLAGS} -o rw rw.o liblwp.a $(DESTDIR)/lib/afs/util.a +rw: rw.o liblwp.a $(TOP_LIBDIR)/util.a + ${CC} ${CFLAGS} -o rw rw.o liblwp.a $(TOP_LIBDIR)/util.a rw.o: rw.c ${CC} ${CFLAGS} -c rw.c @@ -107,25 +121,21 @@ rw.o: rw.c # # Install targets # -install: ${DESTDIR}/lib/liblwp.a \ - ${DESTDIR}/include/lock.h \ - ${DESTDIR}/include/lwp.h \ - ${DESTDIR}/include/preempt.h \ - ${DESTDIR}/include/timer.h +install: ${DESTDIR}${libdir}/liblwp.a ${DESTDIR}${includedir}/lock.h ${DESTDIR}${includedir}/lwp.h ${DESTDIR}${includedir}/preempt.h ${DESTDIR}${includedir}/timer.h -${DESTDIR}/lib/liblwp.a: liblwp.a +${DEST}/lib/liblwp.a: liblwp.a ${INSTALL} $? $@ -${DESTDIR}/include/lock.h: lock.h +${DEST}/include/lock.h: lock.h ${INSTALL} $? $@ -${DESTDIR}/include/lwp.h: lwp.h +${DEST}/include/lwp.h: lwp.h ${INSTALL} $? $@ -${DESTDIR}/include/preempt.h: preempt.h +${DEST}/include/preempt.h: preempt.h ${INSTALL} $? $@ -${DESTDIR}/include/timer.h: timer.h +${DEST}/include/timer.h: timer.h ${INSTALL} $? $@ # @@ -135,3 +145,35 @@ clean: $(RM) -f *.o *.a core AFS_component_version_number.c include ../config/Makefile.version +${DESTDIR}${libdir}/liblwp.a: liblwp.a + ${INSTALL} $? $@ + +${TOP_LIBDIR}/liblwp.a: liblwp.a + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/lock.h: lock.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/lock.h: lock.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/lwp.h: lwp.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/lwp.h: lwp.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/preempt.h: preempt.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/preempt.h: preempt.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/timer.h: timer.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/timer.h: timer.h + ${INSTALL} $? $@ + +dest: ${DEST}/lib/liblwp.a ${DEST}/include/lock.h ${DEST}/include/lwp.h ${DEST}/include/preempt.h ${DEST}/include/timer.h + diff --git a/src/mpp/Makefile.in b/src/mpp/Makefile.in index 32a6f08..bf1077f 100644 --- a/src/mpp/Makefile.in +++ b/src/mpp/Makefile.in @@ -1,8 +1,20 @@ # # (C) Copyright 10/17/86 by Carnegie Mellon University # -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -19,15 +31,20 @@ MANUAL=mpp.1 include ../config/Makefile.${SYS_NAME} include ../config/Makefile.version -system: install - all: ${PROGRAM} -install: ${PROGRAM} - ${INSTALL} -c -s -m 755 ${PROGRAM} ${DESTDIR}etc +install: ${DESTDIR}${sbindir}/${PROGRAM} + +dest: ${DEST}/etc/${PROGRAM} + +${DESTDIR}${sbindir}/${PROGRAM}: ${PROGRAM} + ${INSTALL} $? $@ + +${DEST}/etc/${PROGRAM}: ${PROGRAM} + ${INSTALL} $? $@ installdoc: ${MANUAL} - ${INSTALL} -c ${MANUAL} ${DESTDIR}man/man1 + ${INSTALL} -c ${MANUAL} ${DEST}/man/man1 clean: -$(RM) -f core a.out *.o *.out ${PROGRAM} AFS_component_version_number.c diff --git a/src/ntp/Makefile.in b/src/ntp/Makefile.in index 99739d1..ab558b8 100644 --- a/src/ntp/Makefile.in +++ b/src/ntp/Makefile.in @@ -5,8 +5,22 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -14,10 +28,10 @@ SHELL = /bin/sh include ../config/Makefile.${SYS_NAME} -INCPATH= -I${TOP_SRCDIR}/config -I${DESTDIR}/include +INCPATH=-I${TOP_SRCDIR}/config -I${TOP_INCDIR} BINDIR=/usr/local/etc LINKDIR=/etc -LIBS= ${DESTDIR}/lib/afs/util.a +LIBS=${TOP_LIBDIR}/util.a VERS=3.4 @@ -101,8 +115,8 @@ ntpd.o: AFS_component_version_number.c ntpdc.o: AFS_component_version_number.c read_psti.o: AFS_component_version_number.c -all: ${PROGS} runntp - -@./ntest +#all: ${PROGS} runntp +# -@./ntest ntp: ntp.o ntpsubs.o ${CC} ${LDFLAGS} -o ntp ntp.o ntpsubs.o ${LIBS} ${XLIBS} ${XLIBELFA} @@ -131,22 +145,17 @@ ntpd.o: patchlevel.h # for afs -system: install +all: AFS_component_version_number.c ntest ntpd ntp ntpdc runntp -AFSLIBS= ${DESTDIR}/lib/afs/libauth.a ${DESTDIR}/lib/afs/libcom_err.a ${DESTDIR}/lib/afs/util.a +AFSLIBS=${TOP_LIBDIR}/libauth.a ${TOP_LIBDIR}/libcom_err.a ${TOP_LIBDIR}/util.a -runntp.o: runntp.c ${DESTDIR}/include/afs/cellconfig.h AFS_component_version_number.c - ${CC} ${CFLAGS} -I${DESTDIR}/include -c runntp.c ${AFSLIBS} ${XLIBS} +runntp.o: runntp.c ${TOP_INCDIR}/afs/cellconfig.h AFS_component_version_number.c + ${CC} ${CFLAGS} -I${TOP_INCDIR} -c runntp.c ${AFSLIBS} ${XLIBS} runntp: runntp.o ${AFSLIBS} ${CC} ${LDFLAGS} -o runntp runntp.o ${AFSLIBS} ${XLIBS} -install: AFS_component_version_number.c ntest ntpd ntp ntpdc runntp - ${INSTALL} ntpd ${DESTDIR}/root.server/usr/afs/bin/ntpd - ${INSTALL} ntpdc ${DESTDIR}/root.server/usr/afs/bin/ntpdc - ${INSTALL} ntp ${DESTDIR}/etc/ntp - ${INSTALL} ntpdc ${DESTDIR}/etc/ntpdc - ${INSTALL} runntp ${DESTDIR}/root.server/usr/afs/bin/runntp +install: ${DESTDIR}${afssrvlibexecdir}/ntpd ${DESTDIR}${afssrvsbindir}/ntpdc ${DESTDIR}${sbindir}/ntp ${DESTDIR}${sbindir}/ntpdc ${DESTDIR}${afssrvlibexecdir}/runntp # # If you don't want a symlink to the daemon, comment out the next line @@ -180,6 +189,43 @@ ntp.tar.Z: ${DIST} depend: mkdep $(CFLAGS) $(SRCS) +${DEST}/root.server/usr/afs/bin/ntpd: ntpd + ${INSTALL} $? $@ + +${DESTDIR}${afssrvlibexecdir}/ntpd: ntpd + ${INSTALL} $? $@ + + +${DEST}/root.server/usr/afs/bin/ntpdc: ntpdc + ${INSTALL} $? $@ + +${DESTDIR}${afssrvsbindir}/ntpdc: ntpdc + ${INSTALL} $? $@ + + +${DEST}/etc/ntp: ntp + ${INSTALL} $? $@ + +${DESTDIR}${sbindir}/ntp: ntp + ${INSTALL} $? $@ + + +${DEST}/etc/ntpdc: ntpdc + ${INSTALL} $? $@ + +${DESTDIR}${sbindir}/ntpdc: ntpdc + ${INSTALL} $? $@ + + +${DEST}/root.server/usr/afs/bin/runntp: runntp + ${INSTALL} $? $@ + +${DESTDIR}${afssrvlibexecdir}/runntp: runntp + ${INSTALL} $? $@ + + +dest: ${DEST}/root.server/usr/afs/bin/ntpd ${DEST}/root.server/usr/afs/bin/ntpdc ${DEST}/etc/ntp ${DEST}/etc/ntpdc ${DEST}/root.server/usr/afs/bin/runntp + # DO NOT DELETE THIS LINE -- mkdep uses it. # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/src/null/Makefile.in b/src/null/Makefile.in index 4770fa2..deb0b92 100644 --- a/src/null/Makefile.in +++ b/src/null/Makefile.in @@ -6,8 +6,22 @@ # directory or online at http://www.openafs.org/dl/license10.html # Makefile for the null library. -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -16,11 +30,11 @@ SHELL=/bin/sh include ../config/Makefile.${SYS_NAME} CFLAGS = ${XCFLAGS} -all: install +all: ${TOP_LIBDIR}/libnull.a -install: ${DESTDIR}/lib/afs/libnull.a +install: ${DESTDIR}${libdir}/afs/libnull.a -${DESTDIR}/lib/afs/libnull.a: libnull.a +${DEST}/lib/afs/libnull.a: libnull.a ${INSTALL} $? $@ null.o: null.c AFS_component_version_number.o @@ -34,3 +48,11 @@ clean: $(RM) -f *.o *.a AFS_component_version_number.c include ../config/Makefile.version +${DESTDIR}${libdir}/afs/libnull.a: libnull.a + ${INSTALL} $? $@ + +${TOP_LIBDIR}/libnull.a: libnull.a + ${INSTALL} $? $@ + +dest: ${DEST}/lib/afs/libnull.a + diff --git a/src/package/Makefile.in b/src/package/Makefile.in index cab24a8..6ec6a69 100644 --- a/src/package/Makefile.in +++ b/src/package/Makefile.in @@ -4,8 +4,22 @@ # # Makefile for package, the AFS workstation configuration tool. # -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -13,7 +27,7 @@ SHELL = /bin/sh include ../config/Makefile.${SYS_NAME} -INCLUDES = -I/usr/include -I${TOP_SRCDIR}/config -I${SRCDIR}/include +INCLUDES=-I/usr/include -I${TOP_SRCDIR}/config -I${TOP_INCDIR} DBGFLAG = -UDEBUG CFLAGS = ${DBUG} -DKFLAG -DANDREW -DVICE $(DBGFLAG) $(INCLUDES) $(XCFLAGS) YFLAGS = -vd @@ -60,13 +74,13 @@ TEST_OBJS = test.o \ misc.o \ globfuncs.o -LIBS = ${DESTDIR}/lib/afs/libsys.a \ - ${DESTDIR}/lib/afs/libcmd.a \ - ${DESTDIR}/lib/afs/libcom_err.a \ - ${DESTDIR}/lib/librx.a \ - ${DESTDIR}/lib/afs/libsys.a \ - ${DESTDIR}/lib/afs/util.a \ - ${DESTDIR}/lib/liblwp.a \ +LIBS=${TOP_LIBDIR}/libsys.a \ + ${TOP_LIBDIR}/libcmd.a \ + ${TOP_LIBDIR}/libcom_err.a \ + ${TOP_LIBDIR}/librx.a \ + ${TOP_LIBDIR}/libsys.a \ + ${TOP_LIBDIR}/util.a \ + ${TOP_LIBDIR}/liblwp.a \ ${XLIBS} include ../config/Makefile.version @@ -86,13 +100,31 @@ lex.c: -$(RM) -f lex.c $(LEX) -t lex.l > lex.c -system : install - clean : $(RM) -f *.o gram.c test_gram.c core package package_test *.BAK y.output yacc.tmp yacc.acts\ AFS_component_version_number.c lex.c y.tab.h -install: package package_test - $(INSTALL) -s -c -m 755 package ${DESTDIR}/etc - $(INSTALL) -s -c -m 755 package_test ${DESTDIR}/etc - ${INSTALL} -ns -c -m 755 makepkgfiles ${DESTDIR}/etc +install: ${DESTDIR}${sbindir}/package ${DESTDIR}${sbindir}/package_test ${DESTDIR}${sbindir}/makepkgfiles + + +${DEST}/etc/package: package + ${INSTALL} $? $@ + +${DESTDIR}${sbindir}/package: package + ${INSTALL} $? $@ + +${DEST}/etc/package_test: package_test + ${INSTALL} $? $@ + +${DESTDIR}${sbindir}/package_test: package_test + ${INSTALL} $? $@ + +${DEST}/etc/makepkgfiles: makepkgfiles + ${INSTALL} $? $@ + +${DESTDIR}${sbindir}/makepkgfiles: makepkgfiles + ${INSTALL} $? $@ + + +dest: ${DEST}/etc/package ${DEST}/etc/package_test ${DEST}/etc/makepkgfiles + diff --git a/src/pam/Makefile.in b/src/pam/Makefile.in index fcf26e0..929115c 100644 --- a/src/pam/Makefile.in +++ b/src/pam/Makefile.in @@ -5,8 +5,22 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ SHELL=/bin/sh @@ -14,26 +28,26 @@ KERNELDIR = ../libafs/ include ../config/Makefile.${SYS_NAME} -LIBDIR = ${DESTDIR}/lib/ - LIBSA = ${LIBDIR}/afs/libprot.a ${LIBDIR}/libubik.a -AFSLIBS = ${DESTDIR}/lib/librxkad.a \ - ${LIBDIR}/afs/libsys.a ${DESTDIR}/lib/libdes.a \ - ${LIBDIR}/librx.a ${LIBDIR}/liblwp.a ${LIBDIR}/afs/libaudit.a \ - ${LIBDIR}/afs/libcmd.a ${LIBDIR}/afs/libcom_err.a ${LIBDIR}/afs/util.a + LIBSA = ${TOP_LIBDIR}/libprot.a ${TOP_LIBDIR}/libubik.a +AFSLIBS = ${TOP_LIBDIR}/librxkad.a ${TOP_LIBDIR}/libsys.a \ + ${TOP_LIBDIR}/libdes.a ${TOP_LIBDIR}/librx.a \ + ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/libaudit.a \ + ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/libcom_err.a \ + ${TOP_LIBDIR}/util.a LDFLAGS = ${SHARE_LDFLAGS} - LIBS = ${LIBDIR}/afs/libkauth.a ${LIBSA} ${LIBDIR}/afs/libauth.a \ + LIBS = ${TOP_LIBDIR}/libkauth.a ${LIBSA} ${TOP_LIBDIR}/libauth.a \ ${AFSLIBS} ${PAMLIBS} @LIB_AFSDB@ - KLIBS = ${LIBDIR}/afs/libkauth.krb.a ${LIBSA} ${LIBDIR}/afs/libauth.krb.a \ + KLIBS = ${TOP_LIBDIR}/libkauth.krb.a ${LIBSA} ${TOP_LIBDIR}/libauth.krb.a \ ${AFSLIBS} ${PAMLIBS} @LIB_AFSDB@ SHOBJS = afs_auth.o afs_account.o afs_session.o afs_password.o \ afs_pam_msg.o afs_message.o afs_util.o AFS_component_version_number.o OBJS = $(SHOBJS) test_pam.o -INCLUDES = -I${TOP_SRCDIR}/config -I${DESTDIR}/include \ +INCLUDES=-I${TOP_SRCDIR}/config -I${TOP_INCDIR} \ -I/usr/include -I/usr/include/sys CFLAGS = ${DEBUG} ${INCLUDES} ${PAM_CFLAGS} -all: install +all: test_pam ${TOP_LIBDIR}/pam_afs.so.1 ${TOP_LIBDIR}/pam_afs.krb.so.1 afs_setcred.o: afs_setcred.c afs_pam_msg.h afs_message.h afs_util.h ${CC} ${CFLAGS} -c afs_setcred.c -o afs_setcred.o @@ -90,12 +104,12 @@ test_pam: test_pam.o echo No link line for system $(SYS_NAME). ;; \ esac -install: test_pam ${DESTDIR}/lib/pam_afs.so.1 ${DESTDIR}/lib/pam_afs.krb.so.1 +install: ${DESTDIR}${libdir}/pam_afs.so.1 ${DESTDIR}${libdir}/pam_afs.krb.so.1 -${DESTDIR}/lib/pam_afs.so.1: pam_afs.so.1 +${DEST}/lib/pam_afs.so.1: pam_afs.so.1 ${INSTALL} $? $@ -${DESTDIR}/lib/pam_afs.krb.so.1: pam_afs.krb.so.1 +${DEST}/lib/pam_afs.krb.so.1: pam_afs.krb.so.1 ${INSTALL} $? $@ afs_auth.o: afs_auth.c afs_pam_msg.h afs_message.h afs_util.h @@ -111,3 +125,17 @@ clean: include ../config/Makefile.version +${DESTDIR}${libdir}/pam_afs.so.1: pam_afs.so.1 + ${INSTALL} $? $@ + +${TOP_LIBDIR}/pam_afs.so.1: pam_afs.so.1 + ${INSTALL} $? $@ + +${DESTDIR}${libdir}/pam_afs.krb.so.1: pam_afs.krb.so.1 + ${INSTALL} $? $@ + +${TOP_LIBDIR}/pam_afs.krb.so.1: pam_afs.krb.so.1 + ${INSTALL} $? $@ + +dest: ${DEST}/lib/pam_afs.so.1 ${DEST}/lib/pam_afs.krb.so.1 + diff --git a/src/pinstall/Makefile.in b/src/pinstall/Makefile.in index 2d23a95..49067af 100644 --- a/src/pinstall/Makefile.in +++ b/src/pinstall/Makefile.in @@ -6,8 +6,22 @@ # directory or online at http://www.openafs.org/dl/license10.html # Make modified install -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -16,9 +30,9 @@ SHELL = /bin/sh include ../config/Makefile.${SYS_NAME} LIBS= ${XLIBS} -CFLAGS= ${OPTMZ} -g -I. -I${DESTDIR}/include -I${TOP_SRCDIR}/config ${XCFLAGS} +CFLAGS=${OPTMZ} -g -I. -I${TOP_INCDIR} -I${TOP_SRCDIR}/config ${XCFLAGS} -all: install +all: pinstall pinstall: install.c AFS_component_version_number.c case ${SYS_NAME} in \ @@ -33,18 +47,13 @@ pinstall: install.c AFS_component_version_number.c test: pinstall csh ./test/test_install -${DESTDIR}/bin/install: pinstall - case ${SYS_NAME} in \ - ppc_darwin*) \ - ./pinstall -f pinstall ${DESTDIR}/bin/pinstall ;;\ - *) \ - ./pinstall -f pinstall ${DESTDIR}/bin/install ;;\ - esac +${DEST}/bin/install: pinstall + ${INSTALL} -f $? $@ # Note: Some rule needs to appear here so that OSF's make does not try to # compile install from install.c. A ";" will not work since other platforms # complain. That's why we use 'echo'. -install: ${DESTDIR}/bin/install +install: @echo -n clean: @@ -53,3 +62,5 @@ clean: include ../config/Makefile.version +dest: ${DEST}/bin/install + diff --git a/src/pinstall/test/Makefile.in b/src/pinstall/test/Makefile.in index e55d314..5ecf101 100644 --- a/src/pinstall/test/Makefile.in +++ b/src/pinstall/test/Makefile.in @@ -5,12 +5,28 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ -all: +all: install: +dest: + diff --git a/src/procmgmt/Makefile.in b/src/procmgmt/Makefile.in index 5ddc1c1..53c9d51 100644 --- a/src/procmgmt/Makefile.in +++ b/src/procmgmt/Makefile.in @@ -5,16 +5,30 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ include ../config/Makefile.${SYS_NAME} -CFLAGS = $(DBUG) -I${SRCDIR}/include -I${TOP_SRCDIR}/config ${XCFLAGS} +CFLAGS=$(DBUG) -I${TOP_INCDIR} -I${TOP_SRCDIR}/config ${XCFLAGS} -all: install +all: ${TOP_LIBDIR}/libprocmgmt.a ${TOP_INCDIR}/afs/procmgmt.h # # Build targets @@ -29,13 +43,12 @@ procmgmt_unix.o: procmgmt_unix.c procmgmt.h # # Install targets # -install: ${DESTDIR}/lib/afs/libprocmgmt.a \ - ${DESTDIR}/include/afs/procmgmt.h +install: ${DESTDIR}${libdir}/afs/libprocmgmt.a ${DESTDIR}${includedir}/afs/procmgmt.h -${DESTDIR}/lib/afs/libprocmgmt.a: libprocmgmt.a +${DEST}/lib/afs/libprocmgmt.a: libprocmgmt.a ${INSTALL} $? $@ -${DESTDIR}/include/afs/procmgmt.h: procmgmt.h +${DEST}/include/afs/procmgmt.h: procmgmt.h ${INSTALL} $? $@ # @@ -45,3 +58,17 @@ clean: $(RM) -f *.a *.o core AFS_component_version_number.c include ../config/Makefile.version +${DESTDIR}${libdir}/afs/libprocmgmt.a: libprocmgmt.a + ${INSTALL} $? $@ + +${TOP_LIBDIR}/libprocmgmt.a: libprocmgmt.a + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/procmgmt.h: procmgmt.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/procmgmt.h: procmgmt.h + ${INSTALL} $? $@ + +dest: ${DEST}/lib/afs/libprocmgmt.a ${DEST}/include/afs/procmgmt.h + diff --git a/src/ptserver/Makefile.in b/src/ptserver/Makefile.in index 288a98c..cb365a2 100644 --- a/src/ptserver/Makefile.in +++ b/src/ptserver/Makefile.in @@ -4,8 +4,20 @@ # This software has been released under the terms of the IBM Public # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -14,47 +26,47 @@ SHELL = /bin/sh include ../config/Makefile.${SYS_NAME} UKERNELDIR=../libuafs/ -RXGEN=${SRCDIR}/bin/rxgen -COMPILE_ET = ${SRCDIR}/bin/compile_et - -CFLAGS = $(DBUG) -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS} -INCLS=${SRCDIR}/include/ubik.h \ - ${SRCDIR}/include/lock.h \ - ${SRCDIR}/include/lwp.h \ - ${SRCDIR}/include/rx/rx.h \ - ${SRCDIR}/include/rx/xdr.h \ - ${SRCDIR}/include/afs/keys.h \ - ${SRCDIR}/include/afs/cellconfig.h \ +RXGEN=${TOP_SRCDIR}/rxgen/rxgen +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et + +CFLAGS=$(DBUG) -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} +INCLS=${TOP_INCDIR}/ubik.h \ + ${TOP_INCDIR}/lock.h \ + ${TOP_INCDIR}/lwp.h \ + ${TOP_INCDIR}/rx/rx.h \ + ${TOP_INCDIR}/rx/xdr.h \ + ${TOP_INCDIR}/afs/keys.h \ + ${TOP_INCDIR}/afs/cellconfig.h \ ptserver.h ptclient.h ptint.h ptopcodes.h pterror.h -LINCLS=${SRCDIR}/include/ubik.h \ - ${SRCDIR}/include/lock.h \ - ${SRCDIR}/include/rx/rx.h \ - ${SRCDIR}/include/rx/xdr.h \ - ${SRCDIR}/include/rx/rxkad.h \ - ${SRCDIR}/include/afs/auth.h \ - ${SRCDIR}/include/afs/cellconfig.h \ +LINCLS=${TOP_INCDIR}/ubik.h \ + ${TOP_INCDIR}/lock.h \ + ${TOP_INCDIR}/rx/rx.h \ + ${TOP_INCDIR}/rx/xdr.h \ + ${TOP_INCDIR}/rx/rxkad.h \ + ${TOP_INCDIR}/afs/auth.h \ + ${TOP_INCDIR}/afs/cellconfig.h \ ptclient.h ptint.h pterror.h -LIBS = ${SRCDIR}/lib/libubik.a \ - ${SRCDIR}/lib/afs/libauth.a \ - ${SRCDIR}/lib/librxkad.a \ - ${SRCDIR}/lib/librxstat.a \ - ${SRCDIR}/lib/librx.a \ - ${SRCDIR}/lib/liblwp.a \ - ${SRCDIR}/lib/libdes.a \ - ${SRCDIR}/lib/afs/libcom_err.a \ - ${SRCDIR}/lib/afs/util.a \ - ${SRCDIR}/lib/afs/libsys.a +LIBS=${TOP_LIBDIR}/libubik.a \ + ${TOP_LIBDIR}/libauth.a \ + ${TOP_LIBDIR}/librxkad.a \ + ${TOP_LIBDIR}/librxstat.a \ + ${TOP_LIBDIR}/librx.a \ + ${TOP_LIBDIR}/liblwp.a \ + ${TOP_LIBDIR}/libdes.a \ + ${TOP_LIBDIR}/libcom_err.a \ + ${TOP_LIBDIR}/util.a \ + ${TOP_LIBDIR}/libsys.a -all: install +all: ukinstall ptserver pts pt_util db_verify ${TOP_LIBDIR}/libprot.a ${TOP_INCDIR}/afs/prclient.h ${TOP_INCDIR}/afs/prerror.h ${TOP_INCDIR}/afs/print.h ${TOP_INCDIR}/afs/prserver.h ${TOP_INCDIR}/afs/ptclient.h ${TOP_INCDIR}/afs/pterror.h ${TOP_INCDIR}/afs/ptint.h ${TOP_INCDIR}/afs/ptserver.h readgroup readpwd testpt # # Build targets # -ptserver: ptserver.o ptutils.o ptprocs.o ptint.ss.o ptint.xdr.o utils.o $(LIBS) ${SRCDIR}/lib/afs/libaudit.a - $(CC) ${CFLAGS} -o ptserver ptserver.o ptutils.o ptprocs.o ptint.ss.o ptint.xdr.o utils.o $(LIBS) ${XLIBS} ${SRCDIR}/lib/afs/libaudit.a +ptserver: ptserver.o ptutils.o ptprocs.o ptint.ss.o ptint.xdr.o utils.o $(LIBS) ${TOP_LIBDIR}/libaudit.a + $(CC) ${CFLAGS} -o ptserver ptserver.o ptutils.o ptprocs.o ptint.ss.o ptint.xdr.o utils.o $(LIBS) ${XLIBS} ${TOP_LIBDIR}/libaudit.a ptserver.o: ptserver.c ${INCLS} AFS_component_version_number.c @@ -85,7 +97,7 @@ display.o: display.c ${INCLS} db_verify.o: db_verify.c ${INCLS} AFS_component_version_number.c db_verify: db_verify.o pterror.o display.o $(LIBS) - $(CC) ${CFLAGS} -o db_verify db_verify.o display.o pterror.o $(LIBS) ${XLIBS} ${SRCDIR}/lib/afs/libcmd.a + $(CC) ${CFLAGS} -o db_verify db_verify.o display.o pterror.o $(LIBS) ${XLIBS} ${TOP_LIBDIR}/libcmd.a ptclient: ptclient.o display.o libprot.a $(LIBS) $(CC) ${CFLAGS} -o ptclient ptclient.o display.o libprot.a $(LIBS) ${XLIBS} @@ -103,10 +115,10 @@ libprot.a: ptuser.o pterror.o ptint.cs.o ptint.xdr.o AFS_component_version_numbe $(AR) crv $@ ptuser.o pterror.o ptint.cs.o ptint.xdr.o AFS_component_version_number.o $(RANLIB) $@ -pts: pts.o libprot.a ${SRCDIR}/lib/afs/libcmd.a $(LIBS) - $(CC) ${CFLAGS} -o pts pts.o ${SRCDIR}/lib/afs/libcmd.a libprot.a ${LIBS} ${XLIBS} +pts: pts.o libprot.a ${TOP_LIBDIR}/libcmd.a $(LIBS) + $(CC) ${CFLAGS} -o pts pts.o ${TOP_LIBDIR}/libcmd.a libprot.a ${LIBS} ${XLIBS} -pts.o: pts.c ${LINCLS} ${SRCDIR}/include/afs/cmd.h AFS_component_version_number.c +pts.o: pts.c ${LINCLS} ${TOP_INCDIR}/afs/cmd.h AFS_component_version_number.c readgroup: readgroup.o libprot.a $(LIBS) $(CC) ${CFLAGS} -o readgroup readgroup.o libprot.a ${LIBS} ${XLIBS} @@ -118,15 +130,15 @@ readpwd: readpwd.o libprot.a $(LIBS) readpwd.o: readpwd.c ${LINCLS} AFS_component_version_number.c -testpt: testpt.o libprot.a ${SRCDIR}/lib/afs/libcmd.a $(LIBS) +testpt: testpt.o libprot.a ${TOP_LIBDIR}/libcmd.a $(LIBS) case "$(SYS_NAME)" in \ ppc_darwin_12 ) \ - $(CC) ${CFLAGS} -o testpt testpt.o ${SRCDIR}/lib/afs/libcmd.a libprot.a $(LIBS) ;; \ + $(CC) ${CFLAGS} -o testpt testpt.o ${TOP_LIBDIR}/libcmd.a libprot.a $(LIBS) ;; \ * ) \ - $(CC) ${CFLAGS} -o testpt testpt.o -lm ${SRCDIR}/lib/afs/libcmd.a libprot.a $(LIBS) ${XLIBS} ;; \ + $(CC) ${CFLAGS} -o testpt testpt.o -lm ${TOP_LIBDIR}/libcmd.a libprot.a $(LIBS) ${XLIBS} ;; \ esac -testpt.o: testpt.c ${INCLS} ${SRCDIR}/include/afs/cmd.h AFS_component_version_number.c +testpt.o: testpt.c ${INCLS} ${TOP_INCDIR}/afs/cmd.h AFS_component_version_number.c pt_util: pt_util.o ptutils.o ubik.o utils.o libprot.a $(LIBS) $(CC) ${CFLAGS} -o pt_util pt_util.o ptutils.o ubik.o utils.o libprot.a $(LIBS) ${XLIBS} @@ -150,22 +162,21 @@ ukinstall: ${UKERNELDIR}/afs \ ${UKERNELDIR}/afs/pterror.h \ ${UKERNELDIR}/afs/ptserver.h -install: ukinstall \ - ${DESTDIR}/root.server/usr/afs/bin/ptserver \ - ${DESTDIR}/root.server/usr/afs/bin/pts \ - ${DESTDIR}/bin/pts \ - ${DESTDIR}/root.server/usr/afs/bin/pt_util \ - ${DESTDIR}/etc/prdb_check \ - ${DESTDIR}/lib/afs/libprot.a \ - ${DESTDIR}/include/afs/prclient.h \ - ${DESTDIR}/include/afs/prerror.h \ - ${DESTDIR}/include/afs/print.h \ - ${DESTDIR}/include/afs/prserver.h \ - ${DESTDIR}/include/afs/ptclient.h \ - ${DESTDIR}/include/afs/pterror.h \ - ${DESTDIR}/include/afs/ptint.h \ - ${DESTDIR}/include/afs/ptserver.h \ - readgroup readpwd testpt +install: \ + ${DESTDIR}${afssrvlibexecdir}/ptserver \ + ${DESTDIR}${afssrvbindir}/pts \ + ${DESTDIR}${bindir}/pts \ + ${DESTDIR}${afssrvsbindir}/pt_util \ + ${DESTDIR}${afssrvsbindir}/prdb_check \ + ${DESTDIR}${libdir}/afs/libprot.a \ + ${DESTDIR}${includedir}/afs/prclient.h \ + ${DESTDIR}${includedir}/afs/prerror.h \ + ${DESTDIR}${includedir}/afs/print.h \ + ${DESTDIR}${includedir}/afs/prserver.h \ + ${DESTDIR}${includedir}/afs/ptclient.h \ + ${DESTDIR}${includedir}/afs/pterror.h \ + ${DESTDIR}${includedir}/afs/ptint.h \ + ${DESTDIR}${includedir}/afs/ptserver.h ${UKERNELDIR}/afs: mkdir -p $@ @@ -194,43 +205,43 @@ ${UKERNELDIR}/afsint/ptint.cs.c: Kptint.cs.c ${UKERNELDIR}/afsint/ptint.xdr.c: Kptint.xdr.c ${INSTALL} $? $@ -${DESTDIR}/root.server/usr/afs/bin/ptserver: ptserver +${DEST}/root.server/usr/afs/bin/ptserver: ptserver ${INSTALL} $? $@ -${DESTDIR}/bin/pts ${DESTDIR}/root.server/usr/afs/bin/pts: pts +${DEST}/bin/pts ${DEST}/root.server/usr/afs/bin/pts: pts ${INSTALL} $? $@ -${DESTDIR}/root.server/usr/afs/bin/pt_util: pt_util +${DEST}/root.server/usr/afs/bin/pt_util: pt_util ${INSTALL} $? $@ -${DESTDIR}/lib/afs/libprot.a: libprot.a +${DEST}/lib/afs/libprot.a: libprot.a ${INSTALL} $? $@ -${DESTDIR}/etc/prdb_check: db_verify +${DEST}/etc/prdb_check: db_verify ${INSTALL} -f $? $@ -${DESTDIR}/include/afs/prclient.h: ptclient.h +${DEST}/include/afs/prclient.h: ptclient.h ${INSTALL} $? $@ -${DESTDIR}/include/afs/prerror.h: pterror.h +${DEST}/include/afs/prerror.h: pterror.h ${INSTALL} $? $@ -${DESTDIR}/include/afs/print.h: ptint.h +${DEST}/include/afs/print.h: ptint.h ${INSTALL} $? $@ -${DESTDIR}/include/afs/prserver.h: ptserver.h +${DEST}/include/afs/prserver.h: ptserver.h ${INSTALL} $? $@ -${DESTDIR}/include/afs/ptserver.h: ptserver.h +${DEST}/include/afs/ptserver.h: ptserver.h ${INSTALL} $? $@ -${DESTDIR}/include/afs/ptint.h: ptint.h +${DEST}/include/afs/ptint.h: ptint.h ${INSTALL} $? $@ -${DESTDIR}/include/afs/pterror.h: pterror.h +${DEST}/include/afs/pterror.h: pterror.h ${INSTALL} $? $@ -${DESTDIR}/include/afs/ptclient.h: ptclient.h +${DEST}/include/afs/ptclient.h: ptclient.h ${INSTALL} $? $@ # @@ -242,3 +253,87 @@ clean: core AFS_component_version_number.c Kptint.cs.c Kptint.h Kptint.xdr.c include ../config/Makefile.version +${DESTDIR}${afssrvlibexecdir}/ptserver: ptserver + ${INSTALL} $? $@ + +${DESTDIR}${afssrvbindir}/pts: pts + ${INSTALL} $? $@ + +${DESTDIR}${bindir}/pts: pts + ${INSTALL} $? $@ + +${DESTDIR}${afssrvsbindir}/pt_util: pt_util + ${INSTALL} $? $@ + +${DESTDIR}${afssrvsbindir}/prdb_check: db_verify + ${INSTALL} -f $? $@ + +${DESTDIR}${libdir}/afs/libprot.a: libprot.a + ${INSTALL} $? $@ + +${TOP_LIBDIR}/libprot.a: libprot.a + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/prclient.h: ptclient.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/prclient.h: ptclient.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/prerror.h: pterror.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/prerror.h: pterror.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/print.h: ptint.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/print.h: ptint.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/prserver.h: ptserver.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/prserver.h: ptserver.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/ptclient.h: ptclient.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/ptclient.h: ptclient.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/pterror.h: pterror.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/pterror.h: pterror.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/ptint.h: ptint.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/ptint.h: ptint.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/ptserver.h: ptserver.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/ptserver.h: ptserver.h + ${INSTALL} $? $@ + +dest: \ + ${DEST}/root.server/usr/afs/bin/ptserver \ + ${DEST}/root.server/usr/afs/bin/pts \ + ${DEST}/bin/pts \ + ${DEST}/root.server/usr/afs/bin/pt_util \ + ${DEST}/etc/prdb_check \ + ${DEST}/lib/afs/libprot.a \ + ${DEST}/include/afs/prclient.h \ + ${DEST}/include/afs/prerror.h \ + ${DEST}/include/afs/print.h \ + ${DEST}/include/afs/prserver.h \ + ${DEST}/include/afs/ptclient.h \ + ${DEST}/include/afs/pterror.h \ + ${DEST}/include/afs/ptint.h \ + ${DEST}/include/afs/ptserver.h diff --git a/src/rcp/Makefile.in b/src/rcp/Makefile.in index 3b00b27..0c35913 100644 --- a/src/rcp/Makefile.in +++ b/src/rcp/Makefile.in @@ -16,8 +16,22 @@ # # @(#)Makefile 5.1 (Berkeley) 9/20/88 # -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -29,13 +43,13 @@ SRCS= rcp.c OBJS= rcp.o ../rsh/rcmd.o ../rsh/herror.o ../inetd/ta-rauth.o -CFLAGS = ${OPTMZ} -I${TOP_SRCDIR}/config -I${DESTDIR}/include ${XCFLAGS} -LIBDIR = ${DESTDIR}/lib/ -AFSLIBS = ${LIBDIR}/afs/libkauth.a ${LIBDIR}/libubik.a\ - ${LIBDIR}/afs/libauth.a ${LIBDIR}/afs/libsys.a \ - ${LIBDIR}/librx.a ${LIBDIR}/liblwp.a ${DESTDIR}/lib/librxkad.a\ - ${DESTDIR}/lib/libdes.a ${LIBDIR}/afs/libcmd.a \ - ${LIBDIR}/afs/libcom_err.a ${LIBDIR}/afs/util.a +CFLAGS=${OPTMZ} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} +AFSLIBS = ${TOP_LIBDIR}/libkauth.a ${TOP_LIBDIR}/libubik.a \ + ${TOP_LIBDIR}/libauth.a ${TOP_LIBDIR}/libsys.a \ + ${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/liblwp.a \ + ${TOP_LIBDIR}/librxkad.a ${TOP_LIBDIR}/libdes.a \ + ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/libcom_err.a \ + ${TOP_LIBDIR}/util.a LIBRES = LIBS = ${AFSLIBS} ${LIBRES} MAN= @@ -76,5 +90,14 @@ cleandir: clean depend: ${SRCS} mkdep -p ${CFLAGS} ${SRCS} -install: ${MAN} all - ${INSTALL} rcp ${DESTDIR}/bin/rcp +install: ${DESTDIR}${bindir}/rcp + +${DEST}/bin/rcp: rcp + ${INSTALL} $? $@ + +${DESTDIR}${bindir}/rcp: rcp + ${INSTALL} $? $@ + + +dest: ${DEST}/bin/rcp + diff --git a/src/rlogind/Makefile.in b/src/rlogind/Makefile.in index eb48c14..89f087d 100644 --- a/src/rlogind/Makefile.in +++ b/src/rlogind/Makefile.in @@ -16,8 +16,22 @@ # # @(#)Makefile 5.3 (Berkeley) 9/20/88 # -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -29,17 +43,18 @@ LIBC= /lib/libc.a SRCS= rlogind.c ../rsh/rcmd.c ../rsh/herror.c ../inetd/ta-rauth.c OBJS= rlogind.o ../rsh/rcmd.o ../rsh/herror.o ../inetd/ta-rauth.o MAN= -LIBDIR = ${DESTDIR}/lib/ -AFSLIBS = ${LIBDIR}/afs/libkauth.a ${LIBDIR}/afs/libprot.a ${LIBDIR}/libubik.a\ - ${LIBDIR}/afs/libauth.a ${DESTDIR}/lib/librxkad.a ${LIBDIR}/afs/libsys.a \ - ${LIBDIR}/librx.a ${LIBDIR}/liblwp.a \ - ${LIBDIR}/afs/libsys.a \ - ${DESTDIR}/lib/librxkad.a ${DESTDIR}/lib/libdes.a \ - ${LIBDIR}/afs/libcmd.a ${LIBDIR}/afs/libcom_err.a ${LIBDIR}/afs/util.a ${LIBDIR}/afs/libaudit.a +AFSLIBS = ${TOP_LIBDIR}/libkauth.a ${TOP_LIBDIR}/libprot.a \ + ${TOP_LIBDIR}/libubik.a ${TOP_LIBDIR}/libauth.a \ + ${TOP_LIBDIR}/librxkad.a ${TOP_LIBDIR}/libsys.a \ + ${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/liblwp.a \ + ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/librxkad.a \ + ${TOP_LIBDIR}/libdes.a ${TOP_LIBDIR}/libcmd.a \ + ${TOP_LIBDIR}/libcom_err.a ${TOP_LIBDIR}/util.a \ + ${TOP_LIBDIR}/libaudit.a RES = LIBS = ../login/libutil.a ${RES} ${AFSLIBS} ALIBS= ${AFSLIBS} -CFLAGS= ${OPTMZ} -I${TOP_SRCDIR}/config -I${DESTDIR}/include ${XCFLAGS} +CFLAGS=${OPTMZ} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} include ../config/Makefile.version @@ -86,6 +101,20 @@ cleandir: clean depend: ${SRCS} mkdep -p ${CFLAGS} ${SRCS} -install: ${MAN} all - ${INSTALL} -s -m 755 rlogind ${DESTDIR}/etc/rlogind - ${INSTALL} -s -m 755 rexecd ${DESTDIR}/etc/rexecd +install: ${DESTDIR}${sbindir}/rlogind ${DESTDIR}${sbindir}/rexecd + +${DEST}/etc/rlogind: rlogind + ${INSTALL} $? $@ + +${DESTDIR}${sbindir}/rlogind: rlogind + ${INSTALL} $? $@ + +${DEST}/etc/rexecd: rexecd + ${INSTALL} $? $@ + +${DESTDIR}${sbindir}/rexecd: rexecd + ${INSTALL} $? $@ + + +dest: ${DEST}/etc/rlogind ${DEST}/etc/rexecd + diff --git a/src/rsh/Makefile.in b/src/rsh/Makefile.in index 0dac9d4..b89f27a 100644 --- a/src/rsh/Makefile.in +++ b/src/rsh/Makefile.in @@ -16,8 +16,22 @@ # # @(#)Makefile 5.1 (Berkeley) 9/20/88 # -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -25,26 +39,23 @@ SHELL=/bin/sh include ../config/Makefile.${SYS_NAME} -LIBDIR = ${DESTDIR}/lib/ -INCLUDES= -I${TOP_SRCDIR}/config -I${SRCDIR}/include +INCLUDES=-I${TOP_SRCDIR}/config -I${TOP_INCDIR} CFLAGS= ${DBUG} ${INCLUDES} ${XCFLAGS} LIBC= /lib/libc.a OBJS= rcmd.o ../inetd/ta-rauth.o herror.o MAN= SRCS= rsh.c rcmd.c ../inetd/ta-rauth.c herror.c AFS_component_version_number.c -AFSLIBS = ${LIBDIR}/afs/libkauth.a ${LIBDIR}/libubik.a\ - ${LIBDIR}/afs/libauth.a ${LIBDIR}/afs/libsys.a \ - ${LIBDIR}/librx.a ${LIBDIR}/liblwp.a ${DESTDIR}/lib/librxkad.a\ - ${LIBDIR}/afs/libsys.a \ - ${DESTDIR}/lib/libdes.a ${LIBDIR}/afs/libcmd.a \ - ${LIBDIR}/afs/libcom_err.a ${LIBDIR}/afs/util.a +AFSLIBS = ${TOP_LIBDIR}/libkauth.a ${TOP_LIBDIR}/libubik.a \ + ${TOP_LIBDIR}/libauth.a ${TOP_LIBDIR}/libsys.a \ + ${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/liblwp.a \ + ${TOP_LIBDIR}/librxkad.a ${TOP_LIBDIR}/libsys.a \ + ${TOP_LIBDIR}/libdes.a ${TOP_LIBDIR}/libcmd.a \ + ${TOP_LIBDIR}/libcom_err.a ${TOP_LIBDIR}/util.a LIBS = ${AFSLIBS} include ../config/Makefile.version -all: rlogin rsh - -system: install +all: rsh rsh: rsh.o ${OBJS} ${LIBS} ${CC} -o $@ ${CFLAGS} rsh.o ${OBJS} ${LIBS} ${XLIBS} @@ -69,11 +80,20 @@ cleandir: clean depend: ${SRCS} mkdep -p ${CFLAGS} ${SRCS} -install: ${MAN} all +install: rsh + set -x; \ + case "${SYS_NAME}" in \ + hp* ) \ + ${INSTALL} -m 4755 -f rsh ${DESTDIR}${bindir}/remsh ;; \ + * ) \ + ${INSTALL} -m 4755 rsh ${DESTDIR}${bindir}/rsh ;; \ + esac + +dest: rsh set -x; \ case "${SYS_NAME}" in \ hp* ) \ - ${INSTALL} -m 4755 -f rsh ${DESTDIR}/bin/remsh ;; \ + ${INSTALL} -m 4755 -f rsh ${DEST}/bin/remsh ;; \ * ) \ - ${INSTALL} -m 4755 rsh ${DESTDIR}/bin/rsh ;; \ + ${INSTALL} -m 4755 rsh ${DEST}/bin/rsh ;; \ esac diff --git a/src/rx/Makefile.in b/src/rx/Makefile.in index 8194f6f..1e5bad7 100644 --- a/src/rx/Makefile.in +++ b/src/rx/Makefile.in @@ -5,8 +5,22 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ MKAFS_OSTYPE=@MKAFS_OSTYPE@ @@ -18,7 +32,7 @@ include ../config/Makefile.${SYS_NAME} KERNELDIR = ../libafs/ UKERNELDIR = ../libuafs/ -CFLAGS = ${OPTMZ} -I${TOP_SRCDIR}/config -I${SRCDIR}/include -DRXDEBUG ${XCFLAGS} +CFLAGS=${OPTMZ} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} -DRXDEBUG ${XCFLAGS} # # Generic xdr objects (or, at least, xdr stuff that's not newly defined for rx). @@ -44,11 +58,11 @@ RXOBJS_djgpp = rx_clock.o rx_event.o rx_user.o rx_lwp.o rx.o rx_null.o rx_global rx_getaddr.o rx_misc.o rx_packet.o rx_rdwr.o rx_trace.o rx_conncache.o \ xdr_int64.o rx_xmit_nt.o -BASICINCLS = ${SRCDIR}/include/lwp.h ${SRCDIR}/include/lock.h \ +BASICINCLS=${TOP_INCDIR}/lwp.h ${TOP_INCDIR}/lock.h \ rx_clock.h rx_queue.h rx_event.h -LIBS = librx.a ${SRCDIR}/lib/liblwp.a ${SRCDIR}/lib/afs/libcmd.a \ - ${SRCDIR}/lib/afs/util.a +LIBS=librx.a ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/libcmd.a \ + ${TOP_LIBDIR}/util.a KSRCS = rx.c rx.h rx_clock.c rx_clock.h rx_event.c rx_event.h \ rx_globals.c rx_globals.h rx_kernel.h rx_misc.h \ @@ -58,7 +72,7 @@ KSRCS = rx.c rx.h rx_clock.c rx_clock.h rx_event.c rx_event.h \ xdr_afsuuid.c rx_trace.h xdr_int64.c UKSRCS = $(KSRCS) rx_conncache.c -all: install +all: includes kinstall ukinstall ${TOP_LIBDIR}/librx.a RX_component_version_number.c: AFS_component_version_number.c sed 's/cml_version/rx_cml_version/' RX_component_version_number.c @@ -73,8 +87,6 @@ ${XDROBJS}: xdr.h rx_user.o: rx.h rx_user.h -rxdebug.o: rxdebug.c - rx_packet.o: rx_packet.c rx_packet.h rx_rdwr.o: rx_rdwr.c rx.h @@ -85,11 +97,6 @@ rx_conncache.o: rx.h rx_trace.o: rx_trace.h -rxdumptrace: rx_trace.c - $(RM) -f rxdumptrace - $(CC) $(CFLAGS) -DDUMPTRACE -c -o rxdumptrace.o rx_trace.c - $(CC) $(CFLAGS) -o rxdumptrace rxdumptrace.o ${LIBS} ${XLIBS} - rx_getaddr.o: rx.h rx_getaddr.c rx_globals.o: rx.h rx_user.h rx_globals.h @@ -108,33 +115,38 @@ librx-djgpp.a: ${LIBOBJS_djgpp} RX_component_version_number.o $(AR) crv librx-djgpp.a RX_component_version_number.o ${LIBOBJS_djgpp} $(RANLIB) librx-djgpp.a -${DESTDIR}/etc/rxdebug: rxdebug - ${INSTALL} rxdebug ${DESTDIR}/etc/rxdebug - -rxdebug: rxdebug.o ${DESTDIR}/lib/afs/util.a ${DESTDIR}/lib/afs/libsys.a - ${CC} ${CFLAGS} -o $@ $@.o ${LIBS} ${SRCDIR}/lib/afs/libsys.a ${XLIBS} - # # Install targets # -install: includes kinstall ukinstall \ - ${DESTDIR}/lib/librx.a +install: ${DESTDIR}${libdir}/librx.a \ + ${DESTDIR}${includedir}/rx/rx_packet.h \ + ${DESTDIR}${includedir}/rx/rx.h \ + ${DESTDIR}${includedir}/rx/rx_user.h \ + ${DESTDIR}${includedir}/rx/rx_event.h \ + ${DESTDIR}${includedir}/rx/rx_queue.h \ + ${DESTDIR}${includedir}/rx/rx_globals.h \ + ${DESTDIR}${includedir}/rx/rx_clock.h \ + ${DESTDIR}${includedir}/rx/rx_multi.h \ + ${DESTDIR}${includedir}/rx/rx_pthread.h \ + ${DESTDIR}${includedir}/rx/rx_lwp.h \ + ${DESTDIR}${includedir}/rx/rx_misc.h \ + ${DESTDIR}${includedir}/rx/rx_null.h \ + ${DESTDIR}${includedir}/rx/xdr.h includes: \ - ${DESTDIR}/include/rx \ - ${DESTDIR}/include/rx/rx_packet.h \ - ${DESTDIR}/include/rx/rx.h \ - ${DESTDIR}/include/rx/rx_user.h \ - ${DESTDIR}/include/rx/rx_event.h \ - ${DESTDIR}/include/rx/rx_queue.h \ - ${DESTDIR}/include/rx/rx_globals.h \ - ${DESTDIR}/include/rx/rx_clock.h \ - ${DESTDIR}/include/rx/rx_multi.h \ - ${DESTDIR}/include/rx/rx_pthread.h \ - ${DESTDIR}/include/rx/rx_lwp.h \ - ${DESTDIR}/include/rx/rx_misc.h \ - ${DESTDIR}/include/rx/rx_null.h \ - ${DESTDIR}/include/rx/xdr.h + ${TOP_INCDIR}/rx/rx_packet.h \ + ${TOP_INCDIR}/rx/rx.h \ + ${TOP_INCDIR}/rx/rx_user.h \ + ${TOP_INCDIR}/rx/rx_event.h \ + ${TOP_INCDIR}/rx/rx_queue.h \ + ${TOP_INCDIR}/rx/rx_globals.h \ + ${TOP_INCDIR}/rx/rx_clock.h \ + ${TOP_INCDIR}/rx/rx_multi.h \ + ${TOP_INCDIR}/rx/rx_pthread.h \ + ${TOP_INCDIR}/rx/rx_lwp.h \ + ${TOP_INCDIR}/rx/rx_misc.h \ + ${TOP_INCDIR}/rx/rx_null.h \ + ${TOP_INCDIR}/rx/xdr.h kinstall: ${KERNELDIR}/rx $(INSTALL) $(MKAFS_OSTYPE)/*.[ch] $(KERNELDIR)rx @@ -144,43 +156,43 @@ ukinstall: ${UKERNELDIR}/rx $(INSTALL) $(UKSRCS) $(UKERNELDIR)rx -$(INSTALL) UKERNEL/*.[ch] $(UKERNELDIR)rx -${DESTDIR}/include/rx/rx_packet.h: rx_packet.h +${DEST}/include/rx/rx_packet.h: rx_packet.h ${INSTALL} $? $@ -${DESTDIR}/include/rx/rx.h: rx.h +${DEST}/include/rx/rx.h: rx.h ${INSTALL} $? $@ -${DESTDIR}/include/rx/rx_user.h: rx_user.h +${DEST}/include/rx/rx_user.h: rx_user.h ${INSTALL} $? $@ -${DESTDIR}/include/rx/rx_event.h: rx_event.h +${DEST}/include/rx/rx_event.h: rx_event.h ${INSTALL} $? $@ -${DESTDIR}/include/rx/rx_queue.h: rx_queue.h +${DEST}/include/rx/rx_queue.h: rx_queue.h ${INSTALL} $? $@ -${DESTDIR}/include/rx/rx_globals.h: rx_globals.h +${DEST}/include/rx/rx_globals.h: rx_globals.h ${INSTALL} $? $@ -${DESTDIR}/include/rx/rx_clock.h: rx_clock.h +${DEST}/include/rx/rx_clock.h: rx_clock.h ${INSTALL} $? $@ -${DESTDIR}/include/rx/rx_multi.h: rx_multi.h +${DEST}/include/rx/rx_multi.h: rx_multi.h ${INSTALL} $? $@ -${DESTDIR}/include/rx/rx_pthread.h: rx_pthread.h +${DEST}/include/rx/rx_pthread.h: rx_pthread.h ${INSTALL} $? $@ -${DESTDIR}/include/rx/rx_lwp.h: rx_lwp.h +${DEST}/include/rx/rx_lwp.h: rx_lwp.h ${INSTALL} $? $@ -${DESTDIR}/include/rx/rx_misc.h: rx_misc.h +${DEST}/include/rx/rx_misc.h: rx_misc.h ${INSTALL} $? $@ -${DESTDIR}/include/rx/rx_null.h: rx_null.h +${DEST}/include/rx/rx_null.h: rx_null.h ${INSTALL} $? $@ -${DESTDIR}/include/rx/xdr.h: xdr.h +${DEST}/include/rx/xdr.h: xdr.h ${INSTALL} $? $@ ${UKERNELDIR}/rx: @@ -189,28 +201,123 @@ ${UKERNELDIR}/rx: ${KERNELDIR}/rx: mkdir -p ${KERNELDIR}/rx -install-djgpp: includes kinstall ukinstall librx-djgpp ${DESTDIR}/include/rx/rx_xmit_nt.h ${DESTDIR}/lib/librx-djgpp.a +install-djgpp: includes kinstall ukinstall librx-djgpp ${TOP_INCDIR}/rx/rx_xmit_nt.h ${TOP_LIBDIR}/librx-djgpp.a -${DESTDIR}/lib/librx.a: librx.a +${DEST}/lib/librx.a: librx.a ${INSTALL} $? $@ # rule will never be satisfied ${DESTDIR}/lib/librx-djgpp.a: librx-djgpp.a - ${INSTALL} $? ${DESTdIR}/lib/librx.a + ${INSTALL} $? ${DESTDIR}/lib/librx.a -${DESTDIR}/include/rx: - mkdir -p ${DESTDIR}/include/rx - -${DESTDIR}/include/rx/rx_xmit_nt.h: rx_xmit_nt.h ${DESTDIR}/include/rx +${DESTDIR}/include/rx/rx_xmit_nt.h: rx_xmit_nt.h ${TOP_INCDIR}/rx ${INSTALL} $? $@ # # Misc. targets # clean: - $(RM) -f *.o *.a core *_component_version_number.c rxdumptrace rxdebug + $(RM) -f *.o *.a core *_component_version_number.c include ../config/Makefile.version -test tests: install ${DESTDIR}/etc/rxdebug rxdumptrace +${DESTDIR}${libdir}/librx.a: librx.a + ${INSTALL} $? $@ + +${TOP_LIBDIR}/librx.a: librx.a + ${INSTALL} $? $@ + +dest: ${DEST}/lib/librx.a \ + ${DEST}/include/rx/rx_packet.h \ + ${DEST}/include/rx/rx.h \ + ${DEST}/include/rx/rx_user.h \ + ${DEST}/include/rx/rx_event.h \ + ${DEST}/include/rx/rx_queue.h \ + ${DEST}/include/rx/rx_globals.h \ + ${DEST}/include/rx/rx_clock.h \ + ${DEST}/include/rx/rx_multi.h \ + ${DEST}/include/rx/rx_pthread.h \ + ${DEST}/include/rx/rx_lwp.h \ + ${DEST}/include/rx/rx_misc.h \ + ${DEST}/include/rx/rx_null.h \ + ${DEST}/include/rx/xdr.h + +${DESTDIR}${includedir}/rx/rx_packet.h: rx_packet.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/rx/rx.h: rx.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/rx/rx_user.h: rx_user.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/rx/rx_event.h: rx_event.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/rx/rx_queue.h: rx_queue.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/rx/rx_globals.h: rx_globals.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/rx/rx_clock.h: rx_clock.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/rx/rx_multi.h: rx_multi.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/rx/rx_pthread.h: rx_pthread.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/rx/rx_lwp.h: rx_lwp.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/rx/rx_misc.h: rx_misc.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/rx/rx_null.h: rx_null.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/rx/xdr.h: xdr.h + ${INSTALL} $? $@ + + +${TOP_INCDIR}/rx/rx_packet.h: rx_packet.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/rx/rx.h: rx.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/rx/rx_user.h: rx_user.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/rx/rx_event.h: rx_event.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/rx/rx_queue.h: rx_queue.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/rx/rx_globals.h: rx_globals.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/rx/rx_clock.h: rx_clock.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/rx/rx_multi.h: rx_multi.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/rx/rx_pthread.h: rx_pthread.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/rx/rx_lwp.h: rx_lwp.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/rx/rx_misc.h: rx_misc.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/rx/rx_null.h: rx_null.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/rx/xdr.h: xdr.h + ${INSTALL} $? $@ diff --git a/src/rx/test/Makefile.in b/src/rx/test/Makefile.in index 2eb16b3..29ed542 100644 --- a/src/rx/test/Makefile.in +++ b/src/rx/test/Makefile.in @@ -33,7 +33,7 @@ TH_TESTS = th_testserver th_testclient .IGNORE: -system all: test +all: test test tests: ${TESTS} diff --git a/src/rxdebug/Makefile.in b/src/rxdebug/Makefile.in new file mode 100644 index 0000000..ae2a8bf --- /dev/null +++ b/src/rxdebug/Makefile.in @@ -0,0 +1,73 @@ +# Copyright 2000, International Business Machines Corporation and others. +# All Rights Reserved. +# +# This software has been released under the terms of the IBM Public +# License. For details, see the LICENSE file in the top-level source +# directory or online at http://www.openafs.org/dl/license10.html + +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen +TOP_SRCDIR=@TOP_SRCDIR@ +SYS_NAME=@AFS_SYSNAME@ +MKAFS_OSTYPE=@MKAFS_OSTYPE@ + +SHELL = /bin/sh + +include ../config/Makefile.${SYS_NAME} + +KERNELDIR = ../libafs/ +UKERNELDIR = ../libuafs/ + +CFLAGS=${OPTMZ} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} -I${TOP_INCDIR}/rx -DRXDEBUG ${XCFLAGS} + +LIBS=${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/libcmd.a \ + ${TOP_LIBDIR}/util.a ${TOP_LIBDIR}/libsys.a + +all: rxdebug rxdumptrace + +rxdebug.o: rxdebug.c + +rxdumptrace.o: ../rx/rx_trace.c + $(CC) $(CFLAGS) -DDUMPTRACE -c -o rxdumptrace.o ../rx/rx_trace.c + +rxdumptrace: rxdumptrace.o ${LIBS} + $(RM) -f rxdumptrace + $(CC) $(CFLAGS) -o rxdumptrace rxdumptrace.o ${LIBS} ${XLIBS} + +rxdebug: rxdebug.o ${LIBS} + ${CC} ${CFLAGS} -o $@ $@.o ${LIBS} ${XLIBS} + +# +# Install targets +# +install: ${DESTDIR}${sbindir}/rxdebug + +# +# Misc. targets +# +clean: + $(RM) -f *.o *.a core *_component_version_number.c rxdumptrace rxdebug + +include ../config/Makefile.version + +dest: ${DEST}/etc/rxdebug + +${DESTDIR}${sbindir}/rxdebug: rxdebug + ${INSTALL} $? $@ + +${DEST}/etc/rxdebug: rxdebug + ${INSTALL} $? $@ diff --git a/src/rxdebug/rxdebug.c b/src/rxdebug/rxdebug.c new file mode 100644 index 0000000..67d9d18 --- /dev/null +++ b/src/rxdebug/rxdebug.c @@ -0,0 +1,548 @@ +/* + * Copyright 2000, International Business Machines Corporation and others. + * All Rights Reserved. + * + * This software has been released under the terms of the IBM Public + * License. For details, see the LICENSE file in the top-level source + * directory or online at http://www.openafs.org/dl/license10.html + */ + +#include +#include + +RCSID("$Header$"); + +#include +#include +#ifdef AFS_NT40_ENV +#include +#else +#include +#include +#include +#endif +#ifdef HAVE_NETINET_IN_H +#include +#endif +#ifdef HAVE_SYS_TIME_H +#include +#endif +#ifdef HAVE_UNISTD_H +#include +#endif +#ifdef HAVE_STRING_H +#include +#else +#ifdef HAVE_STRINGS_H +#include +#endif +#endif +#include +#include +#include + +#include + +#include "rx_user.h" +#include "rx_clock.h" +#include "rx_queue.h" +#include "rx.h" +#include "rx_globals.h" + + +#define TIMEOUT 20 + +extern struct hostent *hostutil_GetHostByName(); + +static short PortNumber(aport) +register char *aport; +{ + register int tc; + register short total; + + total = 0; + while (tc = *aport++) { + if (tc < '0' || tc > '9') return -1; /* bad port number */ + total *= 10; + total += tc - (int) '0'; + } + return htons(total); +} + +static short PortName(aname) +register char *aname; +{ + register struct servent *ts; + ts = getservbyname(aname, (char *) 0); + if (!ts) return -1; + return ts->s_port; /* returns it in network byte order */ +} + +int MainCommand(as, arock) +char *arock; +struct cmd_syndesc *as; +{ + register int i; + int s; + int j; + struct sockaddr_in taddr; + afs_int32 host; + struct in_addr hostAddr; + short port; + struct hostent *th; + register afs_int32 code; + int nodally; + int allconns; + int rxstats; + int onlyClient, onlyServer; + afs_int32 onlyHost; + short onlyPort; + int onlyAuth; + int flag; + int dallyCounter; + int withSecStats; + int withAllConn; + int withRxStats; + int withWaiters; + int withIdleThreads; + int withPeers; + struct rx_debugStats tstats; + char *portName, *hostName; + struct rx_debugConn tconn; + short noConns; + short showPeers; + int version_flag; + char version[64]; + afs_int32 length=64; + + afs_uint32 supportedDebugValues = 0; + afs_uint32 supportedStatValues = 0; + afs_uint32 supportedConnValues = 0; + afs_uint32 supportedPeerValues = 0; + afs_int32 nextconn = 0; + afs_int32 nextpeer = 0; + + nodally = (as->parms[2].items ? 1 : 0); + allconns = (as->parms[3].items ? 1 : 0); + rxstats = (as->parms[4].items ? 1 : 0); + onlyServer = (as->parms[5].items ? 1 : 0); + onlyClient = (as->parms[6].items ? 1 : 0); + version_flag=(as->parms[10].items ? 1 : 0); + noConns = (as->parms[11].items ? 1 : 0); + showPeers = (as->parms[12].items ? 1 : 0); + + if (as->parms[0].items) + hostName = as->parms[0].items->data; + else + hostName = (char *) 0; + + if (as->parms[1].items) + portName = as->parms[1].items->data; + else + portName = (char *) 0; + + if (as->parms[7].items) { + char *name = as->parms[7].items->data; + if ((onlyPort = PortNumber(name)) == -1) + onlyPort = PortName(name); + if (onlyPort == -1) { + printf("rxdebug: can't resolve port name %s\n", name); + exit(1); + } + } else onlyPort = -1; + + if (as->parms[8].items) { + char *name = as->parms[8].items->data; + struct hostent *th; + th = hostutil_GetHostByName(name); + if (!th) { + printf("rxdebug: host %s not found in host table\n", name); + exit(1); + } + memcpy(&onlyHost, th->h_addr, sizeof(afs_int32)); + } else onlyHost = -1; + + if (as->parms[9].items) { + char *name = as->parms[9].items->data; + if (strcmp (name, "clear") == 0) onlyAuth = 0; + else if (strcmp (name, "auth") == 0) onlyAuth = 1; + else if (strcmp (name, "crypt") == 0) onlyAuth = 2; + else if ((strcmp (name, "null") == 0) || + (strcmp (name, "none") == 0) || + (strncmp (name, "noauth", 6) == 0) || + (strncmp (name, "unauth", 6) == 0)) onlyAuth = -1; + else { + fprintf (stderr, "Unknown authentication level: %s\n", name); + exit (1); + } + } else onlyAuth = 999; + + /* lookup host */ + if (hostName) { + th = hostutil_GetHostByName(hostName); + if (!th) { + printf("rxdebug: host %s not found in host table\n", hostName); + exit(1); + } + memcpy(&host, th->h_addr, sizeof(afs_int32)); + } + else host = htonl(0x7f000001); /* IP localhost */ + + if (!portName) + port = htons(7000); /* default is fileserver */ + else { + if ((port = PortNumber(portName)) == -1) + port = PortName(portName); + if (port == -1) { + printf("rxdebug: can't resolve port name %s\n", portName); + exit(1); + } + } + + dallyCounter = 0; + + hostAddr.s_addr = host; + printf("Trying %s (port %d):\n", inet_ntoa(hostAddr), ntohs(port)); + s = socket(AF_INET, SOCK_DGRAM, 0); + taddr.sin_family = AF_INET; + taddr.sin_port = 0; + taddr.sin_addr.s_addr = 0; + code = bind(s, (struct sockaddr *) &taddr, sizeof(struct sockaddr_in)); + if (code) { + perror("bind"); + exit(1); + } + + if(version_flag) + { + + code = rx_GetServerVersion(s, host, port, length, version); + if (code < 0) + { + printf("get version call failed with code %d, errno %d\n", + code,errno); + exit(1); + } + printf("AFS version: %s\n",version);fflush(stdout); + + exit(0); + + } + + + code = rx_GetServerDebug(s, host, port, &tstats, &supportedDebugValues); + if (code < 0) { + printf("getstats call failed with code %d\n", code); + exit(1); + } + + withSecStats = (supportedDebugValues & RX_SERVER_DEBUG_SEC_STATS); + withAllConn = (supportedDebugValues & RX_SERVER_DEBUG_ALL_CONN); + withRxStats = (supportedDebugValues & RX_SERVER_DEBUG_RX_STATS); + withWaiters = (supportedDebugValues & RX_SERVER_DEBUG_WAITER_CNT); + withIdleThreads = (supportedDebugValues & RX_SERVER_DEBUG_IDLE_THREADS); + withPeers = (supportedDebugValues & RX_SERVER_DEBUG_ALL_PEER); + + printf("Free packets: %d, packet reclaims: %d, calls: %d, used FDs: %d\n", + tstats.nFreePackets, tstats.packetReclaims, + tstats.callsExecuted, tstats.usedFDs); + if (!tstats.waitingForPackets) printf("not "); + printf("waiting for packets.\n"); + if (withWaiters) + printf("%d calls waiting for a thread\n",tstats.nWaiting); + if ( withIdleThreads ) + printf("%d threads are idle\n", tstats.idleThreads); + + if (rxstats) { + if (!withRxStats) { + noRxStats: + withRxStats = 0; + fprintf (stderr, "WARNING: Server doesn't support retrieval of Rx statistics\n"); + } + else { + struct rx_stats rxstats; + + /* should gracefully handle the case where rx_stats grows */ + code = rx_GetServerStats(s, host, port, &rxstats, &supportedStatValues); + if (code < 0) { + printf("rxstats call failed with code %d\n", code); + exit(1); + } + if (code != sizeof(rxstats)) { + if ((((struct rx_debugIn *)(&rxstats))->type == + RX_DEBUGI_BADTYPE)) goto noRxStats; + printf ("WARNING: returned Rx statistics of unexpected size (got %d)\n", + code); + /* handle other versions?... */ + } + + rx_PrintTheseStats (stdout, &rxstats, sizeof(rxstats), + tstats.nFreePackets, tstats.version); + } + } + + if (!noConns) { + if (allconns) { + if (!withAllConn) fprintf (stderr, "WARNING: Server doesn't support retrieval of all connections,\n getting only interesting instead.\n"); + } + + if (onlyServer) printf ("Showing only server connections\n"); + if (onlyClient) printf ("Showing only client connections\n"); + if (onlyAuth != 999) { + static char *name[] = + {"unauthenticated", "rxkad_clear", "rxkad_auth", "rxkad_crypt"}; + printf ("Showing only %s connections\n", name[onlyAuth+1]); + } + if (onlyHost != -1) { + hostAddr.s_addr = onlyHost; + printf ("Showing only connections from host %s\n", + inet_ntoa(hostAddr)); + } + if (onlyPort != -1) + printf ("Showing only connections on port %u\n", ntohs(onlyPort)); + + for(i=0;;i++) { + code = rx_GetServerConnections(s, host, port, &nextconn, allconns, + supportedDebugValues, &tconn, + &supportedConnValues); + if (code < 0) { + printf("getconn call failed with code %d\n", code); + break; + } + if (tconn.cid == 0xffffffff) { + printf("Done.\n"); + break; + } + + /* see if we're in nodally mode and all calls are dallying */ + if (nodally) { + flag = 0; + for(j=0;j (double) from working, + * this code produces negative lifetimes when run on the + * RT. */ + printf (", expires in %.1f hours", + ((afs_uint32)tconn.secStats.expires - + time(0)) / 3600.0); + if (!(flags & 1)) { + printf ("\n Received %d bytes in %d packets\n", + tconn.secStats.bytesReceived, + tconn.secStats.packetsReceived); + printf (" Sent %d bytes in %d packets\n", + tconn.secStats.bytesSent, + tconn.secStats.packetsSent); + } else printf ("\n"); + break; + } + + default: printf(" unknown\n"); + } + } + + for(j=0;j> 3, tpeer.rtt_dev >> 2); + printf("\ttimeout %d.%03d sec\n", + tpeer.timeout.sec, tpeer.timeout.usec / 1000); + } + } + exit(0); +} + +/* simple main program */ +#ifndef AFS_NT40_ENV +#include "AFS_component_version_number.c" +#endif +int main(argc, argv) +int argc; +char **argv; +{ + struct cmd_syndesc *ts; + +#ifdef AFS_NT40_ENV + if (afs_winsockInit()<0) { + printf("%s: Couldn't initialize winsock. Exiting...\n", argv[0]); + return 1; + } +#endif + + ts = cmd_CreateSyntax((char *) 0, MainCommand, 0, "probe RX server"); + cmd_AddParm(ts, "-servers", CMD_SINGLE, CMD_REQUIRED, "server machine"); + cmd_AddParm(ts, "-port", CMD_SINGLE, CMD_OPTIONAL, "IP port"); + cmd_AddParm(ts, "-nodally", CMD_FLAG, CMD_OPTIONAL, + "don't show dallying conns"); + cmd_AddParm(ts, "-allconnections", CMD_FLAG, CMD_OPTIONAL, + "don't filter out uninteresting connections on server"); + cmd_AddParm(ts, "-rxstats", CMD_FLAG, CMD_OPTIONAL, "show Rx statistics"); + cmd_AddParm(ts, "-onlyserver", CMD_FLAG, CMD_OPTIONAL, + "only show server conns"); + cmd_AddParm(ts, "-onlyclient", CMD_FLAG, CMD_OPTIONAL, + "only show client conns"); + cmd_AddParm(ts, "-onlyport", CMD_SINGLE, CMD_OPTIONAL, "show only "); + cmd_AddParm(ts, "-onlyhost", CMD_SINGLE, CMD_OPTIONAL, "show only "); + cmd_AddParm(ts, "-onlyauth", CMD_SINGLE, CMD_OPTIONAL, + "show only "); + + cmd_AddParm(ts,"-version",CMD_FLAG,CMD_OPTIONAL,"show AFS version id"); + cmd_AddParm(ts,"-noconns",CMD_FLAG,CMD_OPTIONAL,"show no connections"); + cmd_AddParm(ts,"-peers",CMD_FLAG,CMD_OPTIONAL,"show peers"); + + cmd_Dispatch(argc, argv); + exit(0); +} diff --git a/src/rxdebug/rxdebug.rc b/src/rxdebug/rxdebug.rc new file mode 100644 index 0000000..a68887c --- /dev/null +++ b/src/rxdebug/rxdebug.rc @@ -0,0 +1,15 @@ +/* + * Copyright 2000, International Business Machines Corporation and others. + * All Rights Reserved. + * + * This software has been released under the terms of the IBM Public + * License. For details, see the LICENSE file in the top-level source + * directory or online at http://www.openafs.org/dl/license10.html + */ + +/* Define VERSIONINFO resource */ + +#define AFS_VERINFO_FILE_DESCRIPTION "AFS Rx RPC Diagnostic Command" + +#include "AFS_component_version_number.h" +#include "..\config\NTVersioninfo.rc" diff --git a/src/rxgen/Makefile.in b/src/rxgen/Makefile.in index 3ed2d71..ef12238 100644 --- a/src/rxgen/Makefile.in +++ b/src/rxgen/Makefile.in @@ -4,8 +4,22 @@ # Makefile for rpc protocol compiler # Copyright (C) 1987, Sun Microsystems, Inc. # -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -22,9 +36,9 @@ OBJS= rpc_main.o rpc_hout.o rpc_cout.o rpc_parse.o rpc_scan.o rpc_util.o \ rpc_svcout.o rpc_clntout.o GOAL=rxgen -CFLAGS = -I. -I${DESTDIR}/include -I${TOP_SRCDIR}/config ${XCFLAGS} +CFLAGS=-I. -I${TOP_INCDIR} -I${TOP_SRCDIR}/config ${XCFLAGS} -all: install +all: ukinstall rxgen ${TOP_INCDIR}/afs/rxgen_consts.h rxgen: $(OBJS) AFS_component_version_number.c $(CC) $(CFLAGS) $(OBJS) $(XLIBS) -o $@ @@ -32,9 +46,7 @@ rxgen: $(OBJS) AFS_component_version_number.c # # Install targets # -install: ukinstall \ - ${DESTDIR}/bin/rxgen \ - ${DESTDIR}/include/afs/rxgen_consts.h +install: ${DESTDIR}${bindir}/rxgen ${DESTDIR}${includedir}/afs/rxgen_consts.h ukinstall: \ ${UKERNELDIR}/afs \ @@ -46,10 +58,10 @@ ${UKERNELDIR}/afs: ${UKERNELDIR}/afs/rxgen_consts.h: rxgen_consts.h ${INSTALL} $? $@ -${DESTDIR}/bin/rxgen: rxgen +${DEST}/bin/rxgen: rxgen ${INSTALL} $? $@ -${DESTDIR}/include/afs/rxgen_consts.h: rxgen_consts.h +${DEST}/include/afs/rxgen_consts.h: rxgen_consts.h ${INSTALL} $? $@ # @@ -59,3 +71,14 @@ clean: $(RM) -f *.o rxgen core AFS_component_version_number.c include ../config/Makefile.version +${DESTDIR}${bindir}/rxgen: rxgen + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/rxgen_consts.h: rxgen_consts.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/rxgen_consts.h: rxgen_consts.h + ${INSTALL} $? $@ + +dest: ${DEST}/bin/rxgen ${DEST}/include/afs/rxgen_consts.h + diff --git a/src/rxkad/Makefile.in b/src/rxkad/Makefile.in index aa93713..f5e112e 100644 --- a/src/rxkad/Makefile.in +++ b/src/rxkad/Makefile.in @@ -7,8 +7,21 @@ # */ -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -18,16 +31,16 @@ include ../config/Makefile.${SYS_NAME} KERNELDIR = ../libafs/ UKERNELDIR = ../libuafs/ -COMPILE_ET = ${SRCDIR}/bin/compile_et +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et -CFLAGS = ${OPTMZ} -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS} -INCLS= ${SRCDIR}/include/rx/rx.h ${SRCDIR}/include/rx/xdr.h \ +CFLAGS=${OPTMZ} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} +INCLS=${TOP_INCDIR}/rx/rx.h ${TOP_INCDIR}/rx/xdr.h \ rxkad.h OBJS=rxkad_client.o rxkad_server.o rxkad_common.o ticket.o rxkad_errs.o \ fcrypt.o crypt_conn.o -all: install +all: kinstall ukinstall ${TOP_LIBDIR}/librxkad.a ${TOP_INCDIR}/rx/rxkad.h # # Install targets @@ -129,14 +142,12 @@ ${UKERNELDIR}/afs/rxkad_server.c: rxkad_server.c ${UKERNELDIR}/afs/rxkad_common.c: rxkad_common.c ${INSTALL} $? $@ -install: kinstall ukinstall \ - ${DESTDIR}/lib/librxkad.a \ - ${DESTDIR}/include/rx/rxkad.h +install: ${DESTDIR}${libdir}/librxkad.a ${DESTDIR}${includedir}/rx/rxkad.h -${DESTDIR}/lib/librxkad.a: librxkad.a +${DEST}/lib/librxkad.a: librxkad.a ${INSTALL} $? $@ -${DESTDIR}/include/rx/rxkad.h: rxkad.h +${DEST}/include/rx/rxkad.h: rxkad.h ${INSTALL} $? $@ # @@ -203,3 +214,17 @@ tcrypt.c: domestic/tcrypt.c ${INSTALL} $? $@ include ../config/Makefile.version +${DESTDIR}${libdir}/librxkad.a: librxkad.a + ${INSTALL} $? $@ + +${TOP_LIBDIR}/librxkad.a: librxkad.a + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/rx/rxkad.h: rxkad.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/rx/rxkad.h: rxkad.h + ${INSTALL} $? $@ + +dest: ${DEST}/lib/librxkad.a ${DEST}/include/rx/rxkad.h + diff --git a/src/rxstat/Makefile.in b/src/rxstat/Makefile.in index 3f4a5cf..872b4da 100644 --- a/src/rxstat/Makefile.in +++ b/src/rxstat/Makefile.in @@ -5,8 +5,21 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -15,15 +28,15 @@ include ../config/Makefile.${SYS_NAME} KERNELDIR = ../libafs/ UKERNELDIR = ../libuafs/ -RXGEN=${SRCDIR}/bin/rxgen +RXGEN=${TOP_SRCDIR}/rxgen/rxgen KSRCS=rxstat.c rxstat.h Krxstat.ss.c Krxstat.xdr.c -CFLAGS = -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS} +CFLAGS=-I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} LIBOBJS = rxstat.cs.o rxstat.ss.o rxstat.xdr.o rxstat.o -all: install +all: kinstall ukinstall ${TOP_INCDIR}/rx/rxstat.h ${TOP_LIBDIR}/librxstat.a # # Build targets @@ -48,14 +61,12 @@ Krxstat.xdr.c: rxstat.xg # # Install targets # -install: kinstall ukinstall \ - ${DESTDIR}/include/rx/rxstat.h \ - ${DESTDIR}/lib/librxstat.a +install: ${DESTDIR}${includedir}/rx/rxstat.h ${DESTDIR}${libdir}/librxstat.a -${DESTDIR}/lib/librxstat.a: librxstat.a +${DEST}/lib/librxstat.a: librxstat.a ${INSTALL} $? $@ -${DESTDIR}/include/rx/rxstat.h: rxstat.h +${DEST}/include/rx/rxstat.h: rxstat.h ${INSTALL} $? $@ kinstall: ${KERNELDIR}/afsint \ @@ -107,3 +118,17 @@ clean: $(RM) -f rxstat.h *.xdr.c *.cs.c *.ss.c *.o *.a core AFS_component_version_number.c include ../config/Makefile.version +${DESTDIR}${includedir}/rx/rxstat.h: rxstat.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/rx/rxstat.h: rxstat.h + ${INSTALL} $? $@ + +${DESTDIR}${libdir}/librxstat.a: librxstat.a + ${INSTALL} $? $@ + +${TOP_LIBDIR}/librxstat.a: librxstat.a + ${INSTALL} $? $@ + +dest: ${DEST}/include/rx/rxstat.h ${DEST}/lib/librxstat.a + diff --git a/src/scout/Makefile.in b/src/scout/Makefile.in index 2fee39e..3942cba 100644 --- a/src/scout/Makefile.in +++ b/src/scout/Makefile.in @@ -5,8 +5,22 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -15,47 +29,47 @@ SHELL = /bin/sh include ../config/Makefile.${SYS_NAME} -CFLAGS= ${DBUG} -I. \ +CFLAGS=${DBUG} -I. \ -I${TOP_SRCDIR}/config \ - -I${SRCDIR}/include \ - -I${SRCDIR}/include/afs \ - -I${SRCDIR} ${XCFLAGS} + -I${TOP_INCDIR} \ + -I${TOP_INCDIR}/afs \ + ${XCFLAGS} LDFLAGS = ${XLDFLAGS} -INCLS=${SRCDIR}/include/afs/gtxobjects.h \ - ${SRCDIR}/include/afs/gtxwindows.h \ - ${SRCDIR}/include/afs/gtxcurseswin.h \ - ${SRCDIR}/include/afs/gtxdumbwin.h \ - ${SRCDIR}/include/afs/gtxX11win.h \ - ${SRCDIR}/include/afs/gtxobjects.h \ - ${SRCDIR}/include/afs/gtxlightobj.h \ - ${SRCDIR}/include/afs/gtxtextobj.h \ - ${SRCDIR}/include/afs/gtxobjdict.h \ - ${SRCDIR}/include/afs/keys.h \ - ${SRCDIR}/include/afs/cellconfig.h \ - ${SRCDIR}/include/afs/cmd.h +INCLS=${TOP_INCDIR}/afs/gtxobjects.h \ + ${TOP_INCDIR}/afs/gtxwindows.h \ + ${TOP_INCDIR}/afs/gtxcurseswin.h \ + ${TOP_INCDIR}/afs/gtxdumbwin.h \ + ${TOP_INCDIR}/afs/gtxX11win.h \ + ${TOP_INCDIR}/afs/gtxobjects.h \ + ${TOP_INCDIR}/afs/gtxlightobj.h \ + ${TOP_INCDIR}/afs/gtxtextobj.h \ + ${TOP_INCDIR}/afs/gtxobjdict.h \ + ${TOP_INCDIR}/afs/keys.h \ + ${TOP_INCDIR}/afs/cellconfig.h \ + ${TOP_INCDIR}/afs/cmd.h -LIBS= ${SRCDIR}/lib/afs/libgtx.a \ - ${SRCDIR}/lib/afs/libfsprobe.a \ - ${SRCDIR}/lib/afs/libvolser.a \ - ${SRCDIR}/lib/afs/libkauth.a \ - ${SRCDIR}/lib/afs/libauth.a \ - ${SRCDIR}/lib/librxkad.a \ - ${SRCDIR}/lib/libdes.a \ - ${SRCDIR}/lib/afs/libcmd.a \ - ${SRCDIR}/lib/afs/vlib.a ${SRCDIR}/lib/afs/libacl.a \ - ${SRCDIR}/lib/afs/libvldb.a \ - ${SRCDIR}/lib/libubik.a \ - ${SRCDIR}/lib/afs/libafsint.a \ - ${SRCDIR}/lib/afs/libsys.a \ - ${SRCDIR}/lib/librx.a \ - ${SRCDIR}/lib/afs/libsys.a \ - ${SRCDIR}/lib/afs/libaudit.a \ - ${SRCDIR}/lib/afs/libcom_err.a \ - ${SRCDIR}/lib/liblwp.a \ - ${SRCDIR}/lib/afs/util.a +LIBS=${TOP_LIBDIR}/libgtx.a \ + ${TOP_LIBDIR}/libfsprobe.a \ + ${TOP_LIBDIR}/libvolser.a \ + ${TOP_LIBDIR}/libkauth.a \ + ${TOP_LIBDIR}/libauth.a \ + ${TOP_LIBDIR}/librxkad.a \ + ${TOP_LIBDIR}/libdes.a \ + ${TOP_LIBDIR}/libcmd.a \ + ${TOP_LIBDIR}/vlib.a ${TOP_LIBDIR}/libacl.a \ + ${TOP_LIBDIR}/libvldb.a \ + ${TOP_LIBDIR}/libubik.a \ + ${TOP_LIBDIR}/libafsint.a \ + ${TOP_LIBDIR}/libsys.a \ + ${TOP_LIBDIR}/librx.a \ + ${TOP_LIBDIR}/libsys.a \ + ${TOP_LIBDIR}/libaudit.a \ + ${TOP_LIBDIR}/libcom_err.a \ + ${TOP_LIBDIR}/liblwp.a \ + ${TOP_LIBDIR}/util.a -all: install +all: scout # # Build targets @@ -63,14 +77,14 @@ all: install scout.o: scout.c ${INCLS} AFS_component_version_number.c scout: scout.o $(LIBS) - ${CC} ${LDFLAGS} -o scout scout.o $(LIBS) ${TXLIBS} ${SRCDIR}/lib/afs/libtermlib.a ${XLIBS} + ${CC} ${LDFLAGS} -o scout scout.o $(LIBS) ${TXLIBS} ${TOP_LIBDIR}/libtermlib.a ${XLIBS} # # Installation targets # -install: ${DESTDIR}/bin/scout +install: ${DESTDIR}${bindir}/scout -${DESTDIR}/bin/scout: scout +${DEST}/bin/scout: scout ${INSTALL} $? $@ # @@ -81,3 +95,8 @@ clean: include ../config/Makefile.version +${DESTDIR}${bindir}/scout: scout + ${INSTALL} $? $@ + +dest: ${DEST}/bin/scout + diff --git a/src/sgistuff/Makefile.in b/src/sgistuff/Makefile.in index 1e29957..73dbc6d 100644 --- a/src/sgistuff/Makefile.in +++ b/src/sgistuff/Makefile.in @@ -5,8 +5,22 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -19,28 +33,24 @@ SHELL=/bin/sh # include ../config/Makefile.${SYS_NAME} OPTIMIZE=-g -CFLAGS = ${OPTIMIZE} -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS} +CFLAGS=${OPTIMIZE} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} LDFLAGS = ${OPTIMIZE} ${XLDFLAGS} -LIBDIR = ${DESTDIR}/lib/ -AFSLIBS = ${LIBDIR}/afs/libkauth.a ${LIBDIR}/afs/libprot.a ${LIBDIR}/libubik.a \ - ${LIBDIR}/afs/libauth.a ${DESTDIR}/lib/librxkad.a ${LIBDIR}/afs/libsys.a \ - ${DESTDIR}/lib/libdes.a ${LIBDIR}/librx.a ${LIBDIR}/liblwp.a \ - ${LIBDIR}/afs/libcmd.a ${LIBDIR}/afs/libcom_err.a ${LIBDIR}/afs/util.a -KAFSLIBS = ${LIBDIR}/afs/libkauth.krb.a ${LIBDIR}/afs/libprot.a ${LIBDIR}/libubik.a \ - ${LIBDIR}/afs/libauth.krb.a ${DESTDIR}/lib/librxkad.a ${LIBDIR}/afs/libsys.a \ - ${DESTDIR}/lib/libdes.a ${LIBDIR}/librx.a ${LIBDIR}/liblwp.a \ - ${LIBDIR}/afs/libcmd.a ${LIBDIR}/afs/libcom_err.a ${LIBDIR}/afs/util.a +LIBDIR=${TOP_LIBDIR}/ +AFSLIBS=${TOP_LIBDIR}/libkauth.a ${TOP_LIBDIR}/libprot.a ${LIBDIR}/libubik.a \ + ${TOP_LIBDIR}/libauth.a ${TOP_LIBDIR}/librxkad.a ${TOP_LIBDIR}/libsys.a \ + ${TOP_LIBDIR}/libdes.a ${LIBDIR}/librx.a ${LIBDIR}/liblwp.a \ + ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/libcom_err.a ${TOP_LIBDIR}/util.a +KAFSLIBS=${TOP_LIBDIR}/libkauth.krb.a ${TOP_LIBDIR}/libprot.a ${LIBDIR}/libubik.a \ + ${TOP_LIBDIR}/libauth.krb.a ${TOP_LIBDIR}/librxkad.a ${TOP_LIBDIR}/libsys.a \ + ${TOP_LIBDIR}/libdes.a ${LIBDIR}/librx.a ${LIBDIR}/liblwp.a \ + ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/libcom_err.a ${TOP_LIBDIR}/util.a AUTHFILES=../inetd/ta-rauth.o ../rsh/rcmd.o ../rsh/herror.o AUTHLIBS=afsauthlib.so afskauthlib.so TARGETS=$(AUTHLIBS) -default:$(TARGETS) - ${INSTALL} afsauthlib.so ${DESTDIR}/root.client/usr/vice/etc - ${INSTALL} afskauthlib.so ${DESTDIR}/root.client/usr/vice/etc +all: ${TOP_LIBDIR}/afsauthlib.so ${TOP_LIBDIR}/afskauthlib.so -all:$(TARGETS) - -install install.noversion: all default +install install.noversion: ${DESTDIR}${libdir}/afsauthlib.so ${DESTDIR}${libdir}/afskauthlib.so clean: $(RM) -f $(AUTHLIBS) $(AUTHFILES) @@ -62,3 +72,24 @@ afskauthlib.so: sgi_auth.o ${KAFSLIBS} ${AUTHFILES} sgi_auth.o: sgi_auth.c ${CC} ${CFLAGS} -c sgi_auth.c + +${TOP_LIBDIR}/afsauthlib.so: afsauthlib.so + ${INSTALL} $? $@ + +${TOP_LIBDIR}/afskauthlib.so: afskauthlib.so + ${INSTALL} $? $@ + +${DESTDIR}${libdir}/afsauthlib.so: afsauthlib.so + ${INSTALL} $? $@ + +${DESTDIR}${libdir}/afskauthlib.so: afskauthlib.so + ${INSTALL} $? $@ + +${DEST}/root.client/usr/vice/etc/afsauthlib.so: afsauthlib.so + ${INSTALL} $? $@ + +${DEST}/root.client/usr/vice/etc/afskauthlib.so: afskauthlib.so + ${INSTALL} $? $@ + +dest: ${DEST}/root.client/usr/vice/etc/afsauthlib.so ${DEST}/root.client/usr/vice/etc/afskauthlib.so + diff --git a/src/sia/Makefile.in b/src/sia/Makefile.in index a71c7d2..b89dd13 100644 --- a/src/sia/Makefile.in +++ b/src/sia/Makefile.in @@ -7,8 +7,22 @@ # */ -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -19,27 +33,27 @@ DEBUG = UNRESOLVED = include ../config/Makefile.${SYS_NAME} -LIBS1 = ${DESTDIR}/lib/libubik.a ${DESTDIR}/lib/afs/libprot.a -LIBS2 = ${DESTDIR}/lib/librxkad.a ${DESTDIR}/lib/afs/libaudit.a \ - ${DESTDIR}/lib/librx.a ${DESTDIR}/lib/liblwp.a \ - ${DESTDIR}/lib/libdes.a ${DESTDIR}/lib/afs/libcmd.a \ - ${DESTDIR}/lib/afs/libcom_err.a ${DESTDIR}/lib/afs/util.a \ - ${DESTDIR}/lib/afs/libsys.a +LIBS1=${TOP_LIBDIR}/libubik.a ${TOP_LIBDIR}/libprot.a +LIBS2=${TOP_LIBDIR}/librxkad.a ${TOP_LIBDIR}/libaudit.a \ + ${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/liblwp.a \ + ${TOP_LIBDIR}/libdes.a ${TOP_LIBDIR}/libcmd.a \ + ${TOP_LIBDIR}/libcom_err.a ${TOP_LIBDIR}/util.a \ + ${TOP_LIBDIR}/libsys.a -LIBS = ${DESTDIR}/lib/afs/libkauth.a ${LIBS1} ${DESTDIR}/lib/afs/libauth.a ${LIBS2} -KLIBS = ${DESTDIR}/lib/afs/libkauth.krb.a ${LIBS1} ${DESTDIR}/lib/afs/libauth.krb.a ${LIBS2} +LIBS=${TOP_LIBDIR}/libkauth.a ${LIBS1} ${TOP_LIBDIR}/libauth.a ${LIBS2} +KLIBS=${TOP_LIBDIR}/libkauth.krb.a ${LIBS1} ${TOP_LIBDIR}/libauth.krb.a ${LIBS2} -all: test-reauth ${DESTDIR}/lib/afs/libafssiad.so ${DESTDIR}/lib/afs/libafssiad.krb.so +all: ${TOP_LIBDIR}/libafssiad.so ${TOP_LIBDIR}/libafssiad.krb.so clean: $(RM) -f test-reauth libafssiad.so libafssiad.krb.so *.s *.o *.b core *~ *.com *.ld AFS_component_version_number.c -CFLAGS = $(DEBUG) -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS} +CFLAGS=$(DEBUG) -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} -${DESTDIR}/lib/afs/libafssiad.so: libafssiad.so +${DEST}/lib/afs/libafssiad.so: libafssiad.so ${INSTALL} $? $@ -${DESTDIR}/lib/afs/libafssiad.krb.so: libafssiad.krb.so +${DEST}/lib/afs/libafssiad.krb.so: libafssiad.krb.so ${INSTALL} $? $@ siad.o: siad.c @@ -59,7 +73,19 @@ libafssiad.krb.so: siad_krb.o test-reauth: test-reauth.o $(CC) $(CFLAGS) -g -o test-reauth test-reauth.o -lc -install: all +install: ${DESTDIR}${libdir}/afs/libafssiad.so ${DESTDIR}${libdir}/afs/libafssiad.krb.so +${DESTDIR}${libdir}/afs/libafssiad.so: libafssiad.so + ${INSTALL} $? $@ + +${TOP_LIBDIR}/libafssiad.so: libafssiad.so + ${INSTALL} $? $@ + +${DESTDIR}${libdir}/afs/libafssiad.krb.so: libafssiad.krb.so + ${INSTALL} $? $@ + +${TOP_LIBDIR}/libafssiad.krb.so: libafssiad.krb.so + ${INSTALL} $? $@ +dest: ${DEST}/lib/afs/libafssiad.so ${DEST}/lib/afs/libafssiad.krb.so diff --git a/src/sys/Makefile.in b/src/sys/Makefile.in index 95ecdc6..bf6943d 100644 --- a/src/sys/Makefile.in +++ b/src/sys/Makefile.in @@ -7,8 +7,22 @@ # System calls. -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -17,9 +31,9 @@ SHELL = /bin/sh include ../config/Makefile.${SYS_NAME} UKERNELDIR=../libuafs/ -CFLAGS= ${DBUG} -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS} -SFLAGS=-P -I${SRCDIR}/include -LIBS= libsys.a ${SRCDIR}/lib/librx.a libsys.a ${SRCDIR}/lib/liblwp.a ${SRCDIR}/lib/afs/util.a ${XLIBS} +CFLAGS=${DBUG} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} +SFLAGS=-P -I${TOP_INCDIR} +LIBS=libsys.a ${TOP_LIBDIR}/librx.a libsys.a ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/util.a ${XLIBS} UKSRCS=afsl.exp OBJECTS= afssyscalls.o syscall.o @@ -27,20 +41,33 @@ RMTOBJS=rmtsysnet.o rmtsysc.o rmtsys.cs.o rmtsys.xdr.o rmtsys.ss.o rmtsyss.o include ../config/Makefile.version -all: libsys.a ${DESTDIR}/etc/rmtsysd ${DESTDIR}/include/afs/afssyscalls.h \ - ${DESTDIR}/bin/pagsh ${DESTDIR}/bin/pagsh.krb +all: ${TOP_LIBDIR}/libsys.a rmtsysd ${TOP_INCDIR}/afs/afssyscalls.h pagsh pagsh.krb kinstall ukinstall + case "${SYS_NAME}" in \ + rs_aix*) \ + ${INSTALL} afs.exp ${TOP_LIBDIR};; \ + sgi_6? ) \ + ${INSTALL} xfsattrs.h ${TOP_INCDIR}/afs;; \ + esac + +install: ${DESTDIR}${libdir}/afs/libsys.a ${DESTDIR}${sbindir}/rmtsysd ${DESTDIR}${includedir}/afs/afssyscalls.h ${DESTDIR}${bindir}/pagsh ${DESTDIR}${bindir}/pagsh.krb + case "${SYS_NAME}" in \ + rs_aix*) \ + ${INSTALL} afs.exp ${DESTDIR}${includedir}/afs;; \ + sgi_6? ) \ + ${INSTALL} xfsattrs.h ${DESTDIR}${includedir}/afs;; \ + esac -${DESTDIR}/etc/rmtsysd: rmtsysd - ${INSTALL} -s rmtsysd ${DESTDIR}/etc/rmtsysd +${DEST}/etc/rmtsysd: rmtsysd + ${INSTALL} -s $? $@ -${DESTDIR}/bin/pagsh: pagsh - ${INSTALL} -s pagsh ${DESTDIR}/bin/pagsh +${DEST}/bin/pagsh: pagsh + ${INSTALL} -s $? $@ -${DESTDIR}/bin/pagsh.krb: pagsh.krb - ${INSTALL} -s pagsh.krb ${DESTDIR}/bin/pagsh.krb +${DEST}/bin/pagsh.krb: pagsh.krb + ${INSTALL} -s $? $@ -${DESTDIR}/include/afs/afssyscalls.h: afssyscalls.h - ${INSTALL} afssyscalls.h ${DESTDIR}/include/afs/afssyscalls.h +${DEST}/include/afs/afssyscalls.h: afssyscalls.h + ${INSTALL} $? $@ libsys.a: ${OBJECTS} ${RMTOBJS} AFS_component_version_number.o -$(RM) -f $@ @@ -51,25 +78,16 @@ libsys.a: ${OBJECTS} ${RMTOBJS} AFS_component_version_number.o $(AR) crv $@ afsl.exp;; \ esac -system: install - kinstall: case "${SYS_NAME}" in \ rs_aix*) \ - ${INSTALL} afs.exp ${DESTDIR}/lib/afs;; \ + ${INSTALL} afs.exp ${TOP_LIBDIR}/afs;; \ sgi_6? ) \ ${INSTALL} xfsattrs.h ../libafs/afs;; \ *) \ echo No $@ source here;; \ esac -install: all kinstall ukinstall - ${INSTALL} libsys.a ${DESTDIR}/lib/afs - case "${SYS_NAME}" in \ - sgi_6? ) \ - ${INSTALL} xfsattrs.h ${DESTDIR}/include/afs;; \ - esac - ukinstall webinstall: ${UKERNELDIR}/afs ${UKSRCS} ${INSTALL} ${UKSRCS} ${UKERNELDIR}/afs @@ -108,7 +126,7 @@ rmtsysnet.o rmtsysc.o rmtsyss.o rmtsysd.o: rmtsys.h rmtsysd: AFS_component_version_number.o rmtsys.cs.c rmtsys.ss.c rmtsys.xdr.c rmtsys.h: rmtsys.xg - ${SRCDIR}/bin/rxgen rmtsys.xg + ${RXGEN} rmtsys.xg rmtsysd: rmtsysd.o libsys.a ${CC} ${CFLAGS} -o rmtsysd rmtsysd.o ${LIBS} @@ -129,49 +147,49 @@ iinc: iinc.c sgi_6*) \ $(CC) -o iinc ${CFLAGS} iinc.c libsys.a;; \ *) \ - $(CC) -o iinc -I${SRCDIR}/include iinc.c ${LIBS} ${XLIBS};; \ + $(CC) -o iinc -I${TOP_INCDIR} iinc.c ${LIBS} ${XLIBS};; \ esac idec: idec.c AFS_component_version_number.c case "${SYS_NAME}" in \ sgi_6* ) \ $(CC) -o idec ${CFLAGS} idec.c libsys.a;; \ *) \ - $(CC) -o idec -I${SRCDIR}/include idec.c ${LIBS} ${XLIBS};; \ + $(CC) -o idec -I${TOP_INCDIR} idec.c ${LIBS} ${XLIBS};; \ esac icreate:icreate.c AFS_component_version_number.c case "${SYS_NAME}" in \ sgi_6* ) \ $(CC) -o icreate ${CFLAGS} icreate.c libsys.a;; \ *) \ - $(CC) -o icreate -I${SRCDIR}/include icreate.c ${XLIBS};; \ + $(CC) -o icreate -I${TOP_INCDIR} icreate.c ${XLIBS};; \ esac iopen: iopen.c AFS_component_version_number.c case "${SYS_NAME}" in \ sgi_6* ) \ $(CC) -o iopen ${CFLAGS} iopen.c libsys.a;; \ *) \ - $(CC) -o iopen -I${SRCDIR}/include iopen.c ${XLIBS};; \ + $(CC) -o iopen -I${TOP_INCDIR} iopen.c ${XLIBS};; \ esac iread: iread.c AFS_component_version_number.c case "${SYS_NAME}" in \ sgi_6* ) \ ${CC} -o iread ${CFLAGS} iread.c libsys.a;; \ *) \ - ${CC} -o iread -I${SRCDIR}/include iread.c ${XLIBS};; \ + ${CC} -o iread -I${TOP_INCDIR} iread.c ${XLIBS};; \ esac iwrite: iwrite.c AFS_component_version_number.c case "${SYS_NAME}" in \ sgi_6* ) \ ${CC} -o iwrite ${CFLAGS} iwrite.c libsys.a;; \ *) \ - ${CC} -o iwrite -I${SRCDIR}/include iwrite.c ${XLIBS};; \ + ${CC} -o iwrite -I${TOP_INCDIR} iwrite.c ${XLIBS};; \ esac istat: istat.c AFS_component_version_number.c case "${SYS_NAME}" in \ sgi_6* ) \ $(CC) -o istat ${CFLAGS} istat.c libsys.a;; \ *) \ - $(CC) -o istat -I${SRCDIR}/include istat.c ${XLIBS};; \ + $(CC) -o istat -I${TOP_INCDIR} istat.c ${XLIBS};; \ esac fixit: fixit.c AFS_component_version_number.c $(CC) -o fixit -IDEST/include fixit.c libsys.a @@ -189,3 +207,37 @@ clean: $(RM) -f *.o libsys.a xfsinode iinc idec icreate iopen istat core \ rmtsysc rmtsyss *.o rmtsys.ss.c rmtsys.cs.c rmtsys.xdr.c rmtsys.h \ rmtsysd AFS_component_version_number.c pagsh pagsh.krb +${DEST}/lib/afs/libsys.a: libsys.a + ${INSTALL} $? $@ + +${DESTDIR}${libdir}/afs/libsys.a: libsys.a + ${INSTALL} $? $@ + + +${TOP_LIBDIR}/libsys.a: libsys.a + ${INSTALL} $? $@ + + +${DESTDIR}${sbindir}/rmtsysd: rmtsysd + ${INSTALL} -s $? $@ + +${DESTDIR}${includedir}/afs/afssyscalls.h: afssyscalls.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/afssyscalls.h: afssyscalls.h + ${INSTALL} $? $@ + +${DESTDIR}${bindir}/pagsh: pagsh + ${INSTALL} -s $? $@ + +${DESTDIR}${bindir}/pagsh.krb: pagsh.krb + ${INSTALL} -s $? $@ + +dest: ${DEST}/lib/afs/libsys.a ${DEST}/etc/rmtsysd ${DEST}/include/afs/afssyscalls.h ${DEST}/bin/pagsh ${DEST}/bin/pagsh.krb + case "${SYS_NAME}" in \ + rs_aix*) \ + ${INSTALL} afs.exp ${DEST}/include/afs;; \ + sgi_6? ) \ + ${INSTALL} xfsattrs.h ${DEST}/include/afs;; \ + esac + diff --git a/src/tbutc/Makefile.in b/src/tbutc/Makefile.in index df20a87..355ad97 100644 --- a/src/tbutc/Makefile.in +++ b/src/tbutc/Makefile.in @@ -7,8 +7,22 @@ # */ -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -53,38 +67,38 @@ LWPOBJS =lock.o BUTMOBJS =file_tm.o BUTMLIBS =libbutm.a -BUTMINCLS =${SRCDIR}/include/afs/com_err.h ${SRCDIR}/include/afs/butm.h -BUTMINCLUDE=-I${SRCDIR}/include +BUTMINCLS=${TOP_INCDIR}/afs/com_err.h ${TOP_INCDIR}/afs/butm.h +BUTMINCLUDE=-I${TOP_INCDIR} BUTCOBJS =dbentries.o tcprocs.o lwps.o tcmain.o list.o recoverDb.o \ tcudbprocs.o dump.o tcstatus.o butc_xbsa.o \ ${LWPOBJS} ${BUCOORDOBJS} -BUTCINCLS =${SRCDIR}/include/afs/partition.h \ - ${SRCDIR}/include/afs/volume.h \ - ${SRCDIR}/include/afs/vlserver.h \ - ${SRCDIR}/include/rx/rx.h \ - ${SRCDIR}/include/rx/xdr.h \ - ${SRCDIR}/include/afs/keys.h \ - ${SRCDIR}/include/afs/cellconfig.h \ - ${SRCDIR}/include/ubik.h \ - ${SRCDIR}/include/afs/cmd.h \ - ${SRCDIR}/include/afs/butc.h \ - ${SRCDIR}/include/afs/tcdata.h \ - ${SRCDIR}/include/afs/bubasics.h \ - ${SRCDIR}/include/afs/butm.h -BUTCINCLUDE=-I. -I${SRCDIR}/include -BUTCLIBS =${SRCDIR}/lib/afs/libbudb.a \ - ${SRCDIR}/lib/afs/libbubasics.a \ +BUTCINCLS=${TOP_INCDIR}/afs/partition.h \ + ${TOP_INCDIR}/afs/volume.h \ + ${TOP_INCDIR}/afs/vlserver.h \ + ${TOP_INCDIR}/rx/rx.h \ + ${TOP_INCDIR}/rx/xdr.h \ + ${TOP_INCDIR}/afs/keys.h \ + ${TOP_INCDIR}/afs/cellconfig.h \ + ${TOP_INCDIR}/ubik.h \ + ${TOP_INCDIR}/afs/cmd.h \ + ${TOP_INCDIR}/afs/butc.h \ + ${TOP_INCDIR}/afs/tcdata.h \ + ${TOP_INCDIR}/afs/bubasics.h \ + ${TOP_INCDIR}/afs/butm.h +BUTCINCLUDE=-I. -I${TOP_INCDIR} +BUTCLIBS=${TOP_LIBDIR}/libbudb.a \ + ${TOP_LIBDIR}/libbubasics.a \ ${VOLSERLIBS} \ ${BUTMLIBS} \ - ${SRCDIR}/lib/afs/libvldb.a \ - ${SRCDIR}/lib/libafsauthent.a \ - ${SRCDIR}/lib/libafsrpc.a \ - ${SRCDIR}/lib/afs/libcmd.a \ - ${SRCDIR}/lib/afs/util.a \ - ${SRCDIR}/lib/afs/libusd.a \ - ${SRCDIR}/lib/afs/libprocmgmt.a \ - ${SRCDIR}/lib/librx.a + ${TOP_LIBDIR}/libvldb.a \ + ${TOP_LIBDIR}/libafsauthent.a \ + ${TOP_LIBDIR}/libafsrpc.a \ + ${TOP_LIBDIR}/libcmd.a \ + ${TOP_LIBDIR}/util.a \ + ${TOP_LIBDIR}/libusd.a \ + ${TOP_LIBDIR}/libprocmgmt.a \ + ${TOP_LIBDIR}/librx.a include ../config/Makefile.version @@ -288,9 +302,18 @@ pre: fi; \ fi; -all: butc ${BUTMLIBS} -install install.noversion: all - ${INSTALL} butc ${DESTDIR}/etc/butc +all: butc + +install install.noversion: ${DESTDIR}${sbindir}/butc noversion: install system: install +${DEST}/etc/butc: butc + ${INSTALL} $? $@ + +${DESTDIR}${sbindir}/butc: butc + ${INSTALL} $? $@ + + +dest: ${DEST}/etc/butc + diff --git a/src/tsm41/Makefile.in b/src/tsm41/Makefile.in index 6918368..d8cd5e9 100644 --- a/src/tsm41/Makefile.in +++ b/src/tsm41/Makefile.in @@ -5,30 +5,50 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ include ../config/Makefile.${SYS_NAME} OPTIMIZE=-g -CFLAGS = ${OPTIMIZE} -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS} -LIBDIR = ${DESTDIR}/lib/ -AFSLIBS = ${LIBDIR}/afs/libkauth.a ${LIBDIR}/afs/libprot.a ${LIBDIR}/libubik.a \ - ${LIBDIR}/afs/libauth.a ${DESTDIR}/lib/librxkad.a ${LIBDIR}/afs/libsys.a \ - ${DESTDIR}/lib/libdes.a ${LIBDIR}/librx.a ${LIBDIR}/liblwp.a \ - ${LIBDIR}/afs/libcmd.a ${LIBDIR}/afs/libcom_err.a ${LIBDIR}/afs/util.a ${LIBDIR}/afs/libaudit.a -KAFSLIBS = ${LIBDIR}/afs/libkauth.krb.a ${LIBDIR}/afs/libprot.a ${LIBDIR}/libubik.a \ - ${LIBDIR}/afs/libauth.krb.a ${DESTDIR}/lib/librxkad.a ${LIBDIR}/afs/libsys.a \ - ${DESTDIR}/lib/libdes.a ${LIBDIR}/librx.a ${LIBDIR}/liblwp.a \ - ${LIBDIR}/afs/libcmd.a ${LIBDIR}/afs/libcom_err.a ${LIBDIR}/afs/util.a ${LIBDIR}/afs/libaudit.a +CFLAGS=${OPTIMIZE} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} +AFSLIBS = ${TOP_LIBDIR}/libkauth.a ${TOP_LIBDIR}/libprot.a \ + ${TOP_LIBDIR}/libubik.a ${TOP_LIBDIR}/libauth.a \ + ${TOP_LIBDIR}/librxkad.a ${TOP_LIBDIR}/libsys.a \ + ${TOP_LIBDIR}/libdes.a ${TOP_LIBDIR}/librx.a \ + ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/libcmd.a \ + ${TOP_LIBDIR}/libcom_err.a ${TOP_LIBDIR}/util.a \ + ${TOP_LIBDIR}/libaudit.a +KAFSLIBS = ${TOP_LIBDIR}/libkauth.krb.a ${TOP_LIBDIR}/libprot.a \ + ${TOP_LIBDIR}/libubik.a ${TOP_LIBDIR}/libauth.krb.a \ + ${TOP_LIBDIR}/librxkad.a ${TOP_LIBDIR}/libsys.a \ + ${TOP_LIBDIR}/libdes.a ${TOP_LIBDIR}/librx.a \ + ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/libcmd.a \ + ${TOP_LIBDIR}/libcom_err.a ${TOP_LIBDIR}/util.a \ + ${TOP_LIBDIR}/libaudit.a AUTHLIBS=afs_dynamic_auth afs_dynamic_kerbauth IMPORTS = -bI:/lib/aio.exp -bI:/lib/netinet.exp -bI:/lib/sockets.exp -bI:/lib/statcmd.exp LDFLAGS = -eafs_initialize ${IMPORTS} -lsys -lcsys -lc -install install.noversion: $(AUTHLIBS) - ${INSTALL} afs_dynamic_auth ${DESTDIR}/root.client/usr/vice/etc - ${INSTALL} afs_dynamic_kerbauth ${DESTDIR}/root.client/usr/vice/etc +all: $(AUTHLIBS) + +install install.noversion: + clean: $(RM) -f $(AUTHLIBS) $(AUTHFILES) so_locations @@ -43,3 +63,11 @@ aix41_auth.o: aix41_auth.c aix41_auth_krb.o: aix41_auth.c ${CC} ${CFLAGS} -DAFS_KERBEROS_ENV -c aix41_auth.c -o aix41_auth_krb.o +${DEST}/root.client/usr/vice/etc/afs_dynamic_auth: afs_dynamic_auth + ${INSTALL} $? $@ + +${DEST}/root.client/usr/vice/etc/afs_dynamic_kerbauth: afs_dynamic_kerbauth + ${INSTALL} $? $@ + +dest: ${DEST}/root.client/usr/vice/etc/afs_dynamic_auth ${DEST}/root.client/usr/vice/etc/afs_dynamic_kerbauth + diff --git a/src/tviced/Makefile.in b/src/tviced/Makefile.in index cb0e4a1..eb30358 100644 --- a/src/tviced/Makefile.in +++ b/src/tviced/Makefile.in @@ -5,8 +5,22 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -15,7 +29,7 @@ SHELL=/bin/sh include ../config/Makefile.${SYS_NAME} CC=${MT_CC} -INCLUDES=-I${TOP_SRCDIR}/config -I. -I.. -I${SRCDIR}/include -I${SRCDIR}/include/afs +INCLUDES=-I${TOP_SRCDIR}/config -I. -I.. -I${TOP_INCDIR} -I${TOP_INCDIR}/afs CFLAGS=${DBG} ${OPTMZ} -DNINTERFACE ${INCLUDES} ${MT_CFLAGS} -DRXDEBUG LDFLAGS=${DBG} ${XLDFLAGS} @@ -48,9 +62,9 @@ FSINTOBJS= afsaux.o afscbint.cs.o afsint.ss.o afsint.xdr.o objects= ${VICEDOBJS} ${VLSERVEROBJS} ${LWPOBJS} ${LIBACLOBJS} \ ${UTILOBJS} ${DIROBJS} ${VOLOBJS} ${FSINTOBJS} -LIBS= ${SRCDIR}/lib/libafsauthent.a ${SRCDIR}/lib/libafsrpc.a ${SRCDIR}/lib/afs/util.a +LIBS=${TOP_LIBDIR}/libafsauthent.a ${TOP_LIBDIR}/libafsrpc.a ${TOP_LIBDIR}/util.a -all: install +all: fileserver COMPILE=${CC} ${CFLAGS} -c $? @@ -183,12 +197,17 @@ afsint.xdr.o: ${FSINT}/afsint.xdr.c fileserver: ${objects} ${LIBS} ${CC} ${LDFLAGS} -o fileserver ${objects} ${LIBS} ${MTLIBS} ${XLIBS} -${DESTDIR}/root.server/usr/afs/bin/fileserver: fileserver +${DEST}/root.server/usr/afs/bin/fileserver: fileserver ${INSTALL} -ns $? $@ -install: ${DESTDIR}/root.server/usr/afs/bin/fileserver +install: ${DESTDIR}${afssrvlibexecdir}/fileserver clean: $(RM) -f *.o fileserver core AFS_component_version_number.c include ../config/Makefile.version +${DESTDIR}${afssrvlibexecdir}/fileserver: fileserver + ${INSTALL} -ns $? $@ + +dest: ${DEST}/root.server/usr/afs/bin/fileserver + diff --git a/src/ubik/Makefile.in b/src/ubik/Makefile.in index 27d525f..c095d49 100644 --- a/src/ubik/Makefile.in +++ b/src/ubik/Makefile.in @@ -5,8 +5,20 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -14,25 +26,25 @@ SHELL = /bin/sh include ../config/Makefile.${SYS_NAME} -CFLAGS=${OPTMZ} -I${TOP_SRCDIR}/config -I./ -I${SRCDIR}/include ${XCFLAGS} +CFLAGS=${OPTMZ} -I${TOP_SRCDIR}/config -I. -I${TOP_INCDIR} ${XCFLAGS} UKERNELDIR=../libuafs/ LIBOBJS=disk.o remote.o beacon.o recovery.o ubik.o vote.o lock.o phys.o \ ubik_int.cs.o ubik_int.ss.o ubik_int.xdr.o ubikcmd.o \ ubikclient.o uerrors.o -INCLS= ${SRCDIR}/include/lwp.h ${SRCDIR}/include/lock.h \ - ${SRCDIR}/include/rx/rx.h ${SRCDIR}/include/rx/xdr.h \ - ${SRCDIR}/include/lock.h ubik.h ubik_int.h +INCLS=${TOP_INCDIR}/lwp.h ${TOP_INCDIR}/lock.h \ + ${TOP_INCDIR}/rx/rx.h ${TOP_INCDIR}/rx/xdr.h \ + ${TOP_INCDIR}/lock.h ubik.h ubik_int.h -LIBS=${SRCDIR}/lib/librx.a ${SRCDIR}/lib/liblwp.a \ - ${SRCDIR}/lib/afs/libcom_err.a ${SRCDIR}/lib/afs/libcmd.a \ - ${SRCDIR}/lib/afs/util.a ${SRCDIR}/lib/afs/libsys.a ${XLIBS} +LIBS=${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/liblwp.a \ + ${TOP_LIBDIR}/libcom_err.a ${TOP_LIBDIR}/libcmd.a \ + ${TOP_LIBDIR}/util.a ${TOP_LIBDIR}/libsys.a ${XLIBS} -RXGEN=${SRCDIR}/bin/rxgen -COMPILE_ET = ${SRCDIR}/bin/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et -all: libubik.a test +all: test ukinstall ${TOP_LIBDIR}/libubik.a ${TOP_INCDIR}/ubik.h ${TOP_INCDIR}/ubik_int.h udebug utst_server utst_client utst_server: utst_server.o utst_int.ss.o utst_int.xdr.o libubik.a ${CC} ${CFLAGS} -o utst_server utst_server.o utst_int.ss.o utst_int.xdr.o libubik.a $(LIBS) @@ -65,7 +77,7 @@ utst_server.o: utst_server.c ${INCLS} utst_int.h AFS_component_version_number.c utst_client.o: utst_client.c ${INCLS} utst_int.h AFS_component_version_number.c udebug.o: udebug.c ${INCLS} AFS_component_version_number.c - ${CC} ${CFLAGS} -g -I. -I${DESTDIR}/include -I${DESTDIR}/include/afs -I${DESTDIR}/ -c udebug.c + ${CC} ${CFLAGS} -g -I. -I${TOP_INCDIR} -I${TOP_INCDIR}/afs -c udebug.c uerrors.o: uerrors.c @@ -98,25 +110,25 @@ utst_int.xdr.o: utst_int.xdr.c ${INCLS} utst_int.h # # Installation targets # -test: utst_server utst_client \ - ${DESTDIR}/bin/udebug \ - ${DESTDIR}/root.server/usr/afs/bin/udebug +test: all -install: test ukinstall \ - ${DESTDIR}/lib/libubik.a \ - ${DESTDIR}/include/ubik.h \ - ${DESTDIR}/include/ubik_int.h +install: \ + ${DESTDIR}${libdir}/libubik.a \ + ${DESTDIR}${includedir}/ubik.h \ + ${DESTDIR}${includedir}/ubik_int.h \ + ${DESTDIR}${bindir}/udebug \ + ${DESTDIR}${afssrvbindir}/udebug -${DESTDIR}/bin/udebug ${DESTDIR}/root.server/usr/afs/bin/udebug: udebug +${DEST}/bin/udebug ${DEST}/root.server/usr/afs/bin/udebug: udebug ${INSTALL} $? $@ -${DESTDIR}/lib/libubik.a: libubik.a +${DEST}/lib/libubik.a: libubik.a ${INSTALL} $? $@ -${DESTDIR}/include/ubik.h: ubik.h +${DEST}/include/ubik.h: ubik.h ${INSTALL} $? $@ -${DESTDIR}/include/ubik_int.h: ubik_int.h +${DEST}/include/ubik_int.h: ubik_int.h ${INSTALL} $? $@ ukinstall: ${UKERNELDIR}/afs ${UKERNELDIR}/afsint \ @@ -161,3 +173,34 @@ clean: include ../config/Makefile.version +${DESTDIR}${libdir}/libubik.a: libubik.a + ${INSTALL} $? $@ + +${TOP_LIBDIR}/libubik.a: libubik.a + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/ubik.h: ubik.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/ubik.h: ubik.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/ubik_int.h: ubik_int.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/ubik_int.h: ubik_int.h + ${INSTALL} $? $@ + +${DESTDIR}${bindir}/udebug: udebug + ${INSTALL} $? $@ + +${DESTDIR}${afssrvbindir}/udebug: udebug + ${INSTALL} $? $@ + +dest: \ + ${DEST}/lib/libubik.a \ + ${DEST}/include/ubik.h \ + ${DEST}/include/ubik_int.h \ + ${DEST}/bin/udebug \ + ${DEST}/root.server/usr/afs/bin/udebug + diff --git a/src/update/Makefile.in b/src/update/Makefile.in index 5a70d8e..46d8d6a 100644 --- a/src/update/Makefile.in +++ b/src/update/Makefile.in @@ -5,8 +5,21 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -14,20 +27,20 @@ SHELL = /bin/sh include ../config/Makefile.${SYS_NAME} -LIBS = ${SRCDIR}/lib/afs/libauth.a \ - ${SRCDIR}/lib/librxkad.a \ - ${SRCDIR}/lib/libdes.a \ - ${SRCDIR}/lib/librx.a \ - ${SRCDIR}/lib/liblwp.a \ - ${SRCDIR}/lib/afs/libcom_err.a \ - ${SRCDIR}/lib/afs/util.a \ - ${SRCDIR}/lib/afs/libsys.a +LIBS=${TOP_LIBDIR}/libauth.a \ + ${TOP_LIBDIR}/librxkad.a \ + ${TOP_LIBDIR}/libdes.a \ + ${TOP_LIBDIR}/librx.a \ + ${TOP_LIBDIR}/liblwp.a \ + ${TOP_LIBDIR}/libcom_err.a \ + ${TOP_LIBDIR}/util.a \ + ${TOP_LIBDIR}/libsys.a -CFLAGS= -I${SRCDIR}/include -I${TOP_SRCDIR}/config ${XCFLAGS} +CFLAGS=-I${TOP_INCDIR} -I${TOP_SRCDIR}/config ${XCFLAGS} -RXGEN=${SRCDIR}/bin/rxgen +RXGEN=${TOP_SRCDIR}/rxgen/rxgen -all: install +all: upserver upclient # # Build targets @@ -48,13 +61,12 @@ update.cs.c update.ss.c update.er.c update.h: update.xg # # Installation targets # -install : ${DESTDIR}/root.server/usr/afs/bin/upserver \ - ${DESTDIR}/root.server/usr/afs/bin/upclient +install : ${DESTDIR}${afssrvlibexecdir}/upserver ${DESTDIR}${afssrvlibexecdir}/upclient -${DESTDIR}/root.server/usr/afs/bin/upserver: upserver +${DEST}/root.server/usr/afs/bin/upserver: upserver ${INSTALL} $? $@ -${DESTDIR}/root.server/usr/afs/bin/upclient: upclient +${DEST}/root.server/usr/afs/bin/upclient: upclient ${INSTALL} $? $@ # @@ -66,3 +78,11 @@ clean: include ../config/Makefile.version +${DESTDIR}${afssrvlibexecdir}/upserver: upserver + ${INSTALL} $? $@ + +${DESTDIR}${afssrvlibexecdir}/upclient: upclient + ${INSTALL} $? $@ + +dest: ${DEST}/root.server/usr/afs/bin/upserver ${DEST}/root.server/usr/afs/bin/upclient + diff --git a/src/usd/Makefile.in b/src/usd/Makefile.in index 83354af..0747738 100644 --- a/src/usd/Makefile.in +++ b/src/usd/Makefile.in @@ -5,17 +5,31 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ SHELL = /bin/sh include ../config/Makefile.${SYS_NAME} -CFLAGS = -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS} +CFLAGS=-I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} -all: install +all: ${TOP_LIBDIR}/libusd.a ${TOP_INCDIR}/afs/usd.h # # Build targets @@ -30,14 +44,12 @@ usd_file.o: usd_file.c usd.h # # Installation targets # -install: \ - ${DESTDIR}/lib/afs/libusd.a \ - ${DESTDIR}/include/afs/usd.h +install: ${DESTDIR}${libdir}/afs/libusd.a ${DESTDIR}${includedir}/afs/usd.h -${DESTDIR}/lib/afs/libusd.a: libusd.a +${DEST}/lib/afs/libusd.a: libusd.a ${INSTALL} $? $@ -${DESTDIR}/include/afs/usd.h: usd.h +${DEST}/include/afs/usd.h: usd.h ${INSTALL} $? $@ # @@ -47,3 +59,17 @@ clean: $(RM) -f *.o libusd.a core AFS_component_version_number.c include ../config/Makefile.version +${DESTDIR}${libdir}/afs/libusd.a: libusd.a + ${INSTALL} $? $@ + +${TOP_LIBDIR}/libusd.a: libusd.a + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/usd.h: usd.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/usd.h: usd.h + ${INSTALL} $? $@ + +dest: ${DEST}/lib/afs/libusd.a ${DEST}/include/afs/usd.h + diff --git a/src/uss/Makefile.in b/src/uss/Makefile.in index 053b3f7..c18e6d1 100644 --- a/src/uss/Makefile.in +++ b/src/uss/Makefile.in @@ -7,8 +7,22 @@ # uss Makefile -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -16,29 +30,29 @@ SHELL=/bin/sh include ../config/Makefile.${SYS_NAME} -all: install +all: uss -CFLAGS = ${DBUG} -I/usr/include -I${TOP_SRCDIR}/config \ - -I${SRCDIR}/include -I. ${XCFLAGS} +CFLAGS=${DBUG} -I/usr/include -I${TOP_SRCDIR}/config \ + -I${TOP_INCDIR} -I. ${XCFLAGS} # # Build targets # -LIBS = ${SRCDIR}/lib/afs/libvolser.a \ - ${SRCDIR}/lib/afs/libvldb.a \ - ${SRCDIR}/lib/afs/libkauth.a \ - ${SRCDIR}/lib/afs/libprot.a \ - ${SRCDIR}/lib/libubik.a \ - ${SRCDIR}/lib/afs/libauth.a \ - ${SRCDIR}/lib/librxkad.a \ - ${SRCDIR}/lib/afs/libsys.a \ - ${SRCDIR}/lib/libdes.a \ - ${SRCDIR}/lib/librx.a \ - ${SRCDIR}/lib/afs/libsys.a \ - ${SRCDIR}/lib/liblwp.a \ - ${SRCDIR}/lib/afs/libcmd.a \ - ${SRCDIR}/lib/afs/libcom_err.a\ - ${SRCDIR}/lib/afs/util.a \ +LIBS=${TOP_LIBDIR}/libvolser.a \ + ${TOP_LIBDIR}/libvldb.a \ + ${TOP_LIBDIR}/libkauth.a \ + ${TOP_LIBDIR}/libprot.a \ + ${TOP_LIBDIR}/libubik.a \ + ${TOP_LIBDIR}/libauth.a \ + ${TOP_LIBDIR}/librxkad.a \ + ${TOP_LIBDIR}/libsys.a \ + ${TOP_LIBDIR}/libdes.a \ + ${TOP_LIBDIR}/librx.a \ + ${TOP_LIBDIR}/libsys.a \ + ${TOP_LIBDIR}/liblwp.a \ + ${TOP_LIBDIR}/libcmd.a \ + ${TOP_LIBDIR}/libcom_err.a\ + ${TOP_LIBDIR}/util.a \ ${XLIBS} OBJS = uss_procs.o \ @@ -109,9 +123,9 @@ y.tab.c : grammar.y # # Installation targets # -install: ${DESTDIR}/etc/uss +install: ${DESTDIR}${sbindir}/uss -${DESTDIR}/etc/uss: uss +${DEST}/etc/uss: uss ${INSTALL} $? $@ # @@ -123,3 +137,8 @@ clean: include ../config/Makefile.version # +${DESTDIR}${sbindir}/uss: uss + ${INSTALL} $? $@ + +dest: ${DEST}/etc/uss + diff --git a/src/util/Makefile.in b/src/util/Makefile.in index 8de23bd..8604d2a 100644 --- a/src/util/Makefile.in +++ b/src/util/Makefile.in @@ -5,27 +5,37 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ prefix=@prefix@ exec_prefix=@exec_prefix@ afsconfdir=@afsconfdir@ viceetcdir=@viceetcdir@ -afssrvdir=@afssrvdir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ afsdbdir=@afsdbdir@ afslogsdir=@afslogsdir@ afslocaldir=@afslocaldir@ afsbackupdir=@afsbackupdir@ afsbosconfigdir=@afsbosconfigdir@ -afsbosserverdir=@afsbosserverdir@ SHELL = /bin/sh include ../config/Makefile.${SYS_NAME} -CFLAGS = ${OPTMZ} -I${TOP_SRCDIR}/config -I. -I${SRCDIR}/include ${XCFLAGS} +CFLAGS=${OPTMZ} -I${TOP_SRCDIR}/config -I. -I${TOP_INCDIR} ${XCFLAGS} LDFLAGS = ${OPTMZ} ${XLDFLAGS} objects = assert.o base64.o casestrcpy.o ktime.o volparse.o hostparse.o \ @@ -33,21 +43,41 @@ objects = assert.o base64.o casestrcpy.o ktime.o volparse.o hostparse.o \ dirpath.o fileutil.o netutils.o flipbase64.o \ afs_atomlist.o afs_lhash.o snprintf.o ${REGEX_OBJ} -all: install +all: ukinstall kinstall \ + ${TOP_INCDIR}/afs/dirpath.h \ + ${TOP_INCDIR}/afs/pthread_nosigs.h \ + ${TOP_INCDIR}/afs/assert.h \ + ${TOP_INCDIR}/afs/errors.h \ + ${TOP_INCDIR}/afs/vice.h \ + ${TOP_INCDIR}/afs/remote.h \ + ${TOP_INCDIR}/afs/ktime.h \ + ${TOP_INCDIR}/afs/fileutil.h \ + ${TOP_INCDIR}/afs/netutils.h \ + ${TOP_INCDIR}/afs/packages.h \ + ${TOP_INCDIR}/afs/afsutil.h \ + ${TOP_INCDIR}/afs/pthread_glock.h \ + ${TOP_INCDIR}/afs/afs_atomlist.h \ + ${TOP_INCDIR}/afs/afs_lhash.h \ + ${TOP_INCDIR}/potpourri.h \ + ${TOP_LIBDIR}/util.a \ + ${TOP_LIBDIR}/libafsutil.a \ + sys dirpath.h: dirpath.hin Makefile ( sed \ -e "s+@afsconfdir+${afsconfdir}+" \ -e "s+@viceetcdir+${viceetcdir}+" \ - -e "s+@afssrvdir+${afssrvdir}+" \ + -e "s+@afssrvbindir+${afssrvbindir}+" \ + -e "s+@afssrvsbindir+${afssrvsbindir}+" \ + -e "s+@afssrvlibexecdir+${afssrvlibexecdir}+" \ -e "s+@afsdbdir+${afsdbdir}+" \ -e "s+@afslogsdir+${afslogsdir}+" \ -e "s+@afslocaldir+${afslocaldir}+" \ -e "s+@afsbackupdir+${afsbackupdir}+" \ -e "s+@afsbosconfigdir+${afsbosconfigdir}+" \ - -e "s+@afsbosserverdir+${afsbosserverdir}+" \ dirpath.hin >dirpath.h.tmp && \ mv dirpath.h.tmp dirpath.h ) + util.a: ${objects} AFS_component_version_number.o $(RM) -f util.a $(AR) crv util.a ${objects} AFS_component_version_number.o @@ -77,7 +107,7 @@ get_krbrlm.o: get_krbrlm.c uuid.o: uuid.c ${CC} ${CFLAGS} -c uuid.c -sys.o: sys.c ${SRCDIR}/include/afs/param.h AFS_component_version_number.c +sys.o: sys.c ${TOP_INCDIR}/afs/param.h AFS_component_version_number.c ${CC} ${CFLAGS} -c sys.c sys: sys.o @@ -109,83 +139,194 @@ afs_lhash.o: afs_lhash.c afs_lhash.h afs_atomlist.h # KDIR=../libafs/afs UKDIR=../libuafs/afs -INCDIR=${DESTDIR}/include -LIBDIR=${DESTDIR}/lib/afs -install: ukinstall kinstall \ - ${INCDIR}/afs/dirpath.h \ - ${INCDIR}/afs/pthread_nosigs.h \ - ${INCDIR}/afs/assert.h \ - ${INCDIR}/afs/errors.h \ - ${INCDIR}/afs/vice.h \ - ${INCDIR}/afs/remote.h \ - ${INCDIR}/afs/ktime.h \ - ${INCDIR}/afs/fileutil.h \ - ${INCDIR}/afs/netutils.h \ - ${INCDIR}/afs/packages.h \ - ${INCDIR}/afs/afsutil.h \ - ${INCDIR}/afs/pthread_glock.h \ - ${INCDIR}/afs/afs_atomlist.h \ - ${INCDIR}/afs/afs_lhash.h \ - ${INCDIR}/potpourri.h \ - ${LIBDIR}/util.a \ - ${LIBDIR}/libafsutil.a \ - ${DESTDIR}/bin/sys +install: \ + ${DESTDIR}${includedir}/afs/dirpath.h \ + ${DESTDIR}${includedir}/afs/pthread_nosigs.h \ + ${DESTDIR}${includedir}/afs/assert.h \ + ${DESTDIR}${includedir}/afs/errors.h \ + ${DESTDIR}${includedir}/afs/vice.h \ + ${DESTDIR}${includedir}/afs/remote.h \ + ${DESTDIR}${includedir}/afs/ktime.h \ + ${DESTDIR}${includedir}/afs/fileutil.h \ + ${DESTDIR}${includedir}/afs/netutils.h \ + ${DESTDIR}${includedir}/afs/packages.h \ + ${DESTDIR}${includedir}/afs/afsutil.h \ + ${DESTDIR}${includedir}/afs/pthread_glock.h \ + ${DESTDIR}${includedir}/afs/afs_atomlist.h \ + ${DESTDIR}${includedir}/afs/afs_lhash.h \ + ${DESTDIR}${includedir}/potpourri.h \ + ${DESTDIR}${libdir}/afs/util.a \ + ${DESTDIR}${libdir}/afs/libafsutil.a \ + ${DESTDIR}${bindir}/sys + +${TOP_INCDIR}/afs/dirpath.h: dirpath.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/pthread_nosigs.h: pthread_nosigs.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/assert.h: assert.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/errors.h: errors.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/vice.h: vice.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/remote.h: remote.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/ktime.h: ktime.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/fileutil.h: fileutil.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/netutils.h: netutils.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/packages.h: packages.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/afsutil.h: afsutil.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/pthread_glock.h: pthread_glock.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/afs_atomlist.h: afs_atomlist.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/afs_lhash.h: afs_lhash.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/potpourri.h: potpourri.h + ${INSTALL} $? $@ + + +${TOP_LIBDIR}/util.a: util.a + ${INSTALL} $? $@ + +${TOP_LIBDIR}/libafsutil.a: util.a + ${INSTALL} $? $@ + + +${DESTDIR}${includedir}/afs/dirpath.h: dirpath.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/pthread_nosigs.h: pthread_nosigs.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/assert.h: assert.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/errors.h: errors.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/vice.h: vice.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/remote.h: remote.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/ktime.h: ktime.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/fileutil.h: fileutil.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/netutils.h: netutils.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/packages.h: packages.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/afsutil.h: afsutil.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/pthread_glock.h: pthread_glock.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/afs_atomlist.h: afs_atomlist.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/afs_lhash.h: afs_lhash.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/potpourri.h: potpourri.h + ${INSTALL} $? $@ + + +${DESTDIR}${libdir}/afs/util.a: util.a + ${INSTALL} $? $@ -${INCDIR}/afs/dirpath.h: dirpath.h +${DESTDIR}${libdir}/afs/libafsutil.a: util.a ${INSTALL} $? $@ -${INCDIR}/afs/pthread_nosigs.h: pthread_nosigs.h + +${DESTDIR}${bindir}/sys: sys + ${INSTALL} $? $@ + + +${DEST}/include/afs/dirpath.h: dirpath.h + ${INSTALL} $? $@ + +${DEST}/include/afs/pthread_nosigs.h: pthread_nosigs.h ${INSTALL} $? $@ -${INCDIR}/afs/assert.h: assert.h +${DEST}/include/afs/assert.h: assert.h ${INSTALL} $? $@ -${INCDIR}/afs/errors.h: errors.h +${DEST}/include/afs/errors.h: errors.h ${INSTALL} $? $@ -${INCDIR}/afs/vice.h: vice.h +${DEST}/include/afs/vice.h: vice.h ${INSTALL} $? $@ -${INCDIR}/afs/remote.h: remote.h +${DEST}/include/afs/remote.h: remote.h ${INSTALL} $? $@ -${INCDIR}/afs/ktime.h: ktime.h +${DEST}/include/afs/ktime.h: ktime.h ${INSTALL} $? $@ -${INCDIR}/afs/fileutil.h: fileutil.h +${DEST}/include/afs/fileutil.h: fileutil.h ${INSTALL} $? $@ -${INCDIR}/afs/netutils.h: netutils.h +${DEST}/include/afs/netutils.h: netutils.h ${INSTALL} $? $@ -${INCDIR}/afs/packages.h: packages.h +${DEST}/include/afs/packages.h: packages.h ${INSTALL} $? $@ -${INCDIR}/afs/afsutil.h: afsutil.h +${DEST}/include/afs/afsutil.h: afsutil.h ${INSTALL} $? $@ -${INCDIR}/afs/pthread_glock.h: pthread_glock.h +${DEST}/include/afs/pthread_glock.h: pthread_glock.h ${INSTALL} $? $@ -${INCDIR}/afs/afs_atomlist.h: afs_atomlist.h +${DEST}/include/afs/afs_atomlist.h: afs_atomlist.h ${INSTALL} $? $@ -${INCDIR}/afs/afs_lhash.h: afs_lhash.h +${DEST}/include/afs/afs_lhash.h: afs_lhash.h ${INSTALL} $? $@ -${INCDIR}/potpourri.h: potpourri.h +${DEST}/include/potpourri.h: potpourri.h ${INSTALL} $? $@ -${LIBDIR}/util.a: util.a + +${DEST}/lib/afs/util.a: util.a ${INSTALL} $? $@ -${LIBDIR}/libafsutil.a: util.a +${DEST}/lib/afs/libafsutil.a: util.a ${INSTALL} $? $@ -${DESTDIR}/bin/sys: sys + +${DEST}/bin/sys: sys ${INSTALL} $? $@ + kinstall: ${KDIR}/vice.h \ ${KDIR}/afs_base64.c \ ${KDIR}/afs_uuid.c \ @@ -297,3 +438,26 @@ test: cd test; $(MAKE) include ../config/Makefile.version +${DESTDIR}${bindir}/sys: sys + ${INSTALL} $? $@ + +dest: \ + ${DEST}/include/afs/dirpath.h \ + ${DEST}/include/afs/pthread_nosigs.h \ + ${DEST}/include/afs/assert.h \ + ${DEST}/include/afs/errors.h \ + ${DEST}/include/afs/vice.h \ + ${DEST}/include/afs/remote.h \ + ${DEST}/include/afs/ktime.h \ + ${DEST}/include/afs/fileutil.h \ + ${DEST}/include/afs/netutils.h \ + ${DEST}/include/afs/packages.h \ + ${DEST}/include/afs/afsutil.h \ + ${DEST}/include/afs/pthread_glock.h \ + ${DEST}/include/afs/afs_atomlist.h \ + ${DEST}/include/afs/afs_lhash.h \ + ${DEST}/include/potpourri.h \ + ${DEST}/lib/afs/util.a \ + ${DEST}/lib/afs/libafsutil.a \ + ${DEST}/bin/sys + diff --git a/src/util/dirpath.hin b/src/util/dirpath.hin index 1a63803..3f3e67a 100644 --- a/src/util/dirpath.hin +++ b/src/util/dirpath.hin @@ -104,7 +104,7 @@ ConstructLocalLogPath(const char *cpath, /* afs installation dir names */ #define AFSDIR_SERVER_ETC_DIR "@afsconfdir" #define AFSDIR_CLIENT_ETC_DIR "@viceetcdir" -#define AFSDIR_SERVER_BIN_DIR "@afssrvdir" +#define AFSDIR_SERVER_BIN_DIR "@afssrvlibexecdir" #define AFSDIR_CORES_DIR "cores" #define AFSDIR_DB_DIR "@afsdbdir" #define AFSDIR_LOGS_DIR "@afslogsdir" @@ -113,7 +113,7 @@ ConstructLocalLogPath(const char *cpath, #define AFSDIR_MIGR_DIR "@afslocaldir/migrate" #define AFSDIR_BIN_FILE_DIR "@afslocaldir/migrate/bin_files" #define AFSDIR_BOSCONFIG_DIR "@afsbosconfigdir" -#define AFSDIR_BOSSERVER_DIR "@afsbosserverdir" +#define AFSDIR_BOSSERVER_DIR "@afssrvsbindir" /* file names */ #define AFSDIR_THISCELL_FILE "ThisCell" diff --git a/src/venus/Makefile.in b/src/venus/Makefile.in index 93c24fc..8075bfa 100644 --- a/src/venus/Makefile.in +++ b/src/venus/Makefile.in @@ -5,8 +5,22 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -20,46 +34,42 @@ include ../config/Makefile.${SYS_NAME} INSTALLex = ${INSTALL} -m 755 CCXPG2= /usr/xpg2bin/cc -CFLAGS = ${OPTMZ} -I${DESTDIR}/include -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS} - -INCLS = ${DESTDIR}/include/afs/afsint.h \ - ${DESTDIR}/include/afs/cmd.h \ - ${DESTDIR}/include/afs/afsutil.h - -VLIB = ${DESTDIR}/lib/afs/ - -LIB = ${DESTDIR}/lib/ - -FSLIBS = ${VLIB}/libsys.a \ - ${VLIB}/libvldb.a \ - ${LIB}/libubik.a \ - ${VLIB}vlib.a \ - ${VLIB}/libauth.a \ - ${DESTDIR}/lib/librxkad.a \ - ${VLIB}/libcom_err.a \ - ${VLIB}/libcmd.a \ - ${VLIB}/libkauth.a \ - ${DESTDIR}/lib/libdes.a \ - ${LIB}/librx.a \ - ${VLIB}/libsys.a \ - $(VLIB)util.a \ - ${LIB}/liblwp.a \ - ${VLIB}/libaudit.a - -CMLIBS = ${VLIB}/libsys.a \ - ${VLIB}/libafsint.a \ - ${DESTDIR}/lib/librxkad.a \ - ${VLIB}/libauth.a \ - ${VLIB}/libcom_err.a \ - ${VLIB}/libcmd.a \ - ${LIB}/librx.a \ - ${VLIB}/libsys.a \ - $(VLIB)util.a \ - ${LIB}/liblwp.a +CFLAGS=${OPTMZ} -I${TOP_INCDIR} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} + +INCLS=${TOP_INCDIR}/afs/afsint.h \ + ${TOP_INCDIR}/afs/cmd.h \ + ${TOP_INCDIR}/afs/afsutil.h + +FSLIBS=${TOP_LIBDIR}/libsys.a \ + ${TOP_LIBDIR}/libvldb.a \ + ${TOP_LIBDIR}/libubik.a \ + ${TOP_LIBDIR}/vlib.a \ + ${TOP_LIBDIR}/libauth.a \ + ${TOP_LIBDIR}/librxkad.a \ + ${TOP_LIBDIR}/libcom_err.a \ + ${TOP_LIBDIR}/libcmd.a \ + ${TOP_LIBDIR}/libkauth.a \ + ${TOP_LIBDIR}/libdes.a \ + ${TOP_LIBDIR}/librx.a \ + ${TOP_LIBDIR}/libsys.a \ + $(TOP_LIBDIR)/util.a \ + ${TOP_LIBDIR}/liblwp.a \ + ${TOP_LIBDIR}/libaudit.a + +CMLIBS=${TOP_LIBDIR}/libsys.a \ + ${TOP_LIBDIR}/libafsint.a \ + ${TOP_LIBDIR}/librxkad.a \ + ${TOP_LIBDIR}/libauth.a \ + ${TOP_LIBDIR}/libcom_err.a \ + ${TOP_LIBDIR}/libcmd.a \ + ${TOP_LIBDIR}/librx.a \ + ${TOP_LIBDIR}/libsys.a \ + $(TOP_LIBDIR)/util.a \ + ${TOP_LIBDIR}/liblwp.a LIBS = ${FSLIBS} -all: install +all: fs up fstrace cmdebug kdump kdump64 # # Build targets @@ -69,42 +79,42 @@ cacheout: cacheout.o cacheout.o: cacheout.c -${DESTDIR}/bin/fs ${DESTDIR}/root.server/usr/afs/bin/fs: fs +${DEST}/bin/fs ${DEST}/root.server/usr/afs/bin/fs: fs ${INSTALL} -s $? $@ -${DESTDIR}/bin/up: up +${DEST}/bin/up: up ${INSTALL} -s $? $@ -${DESTDIR}/etc/fstrace: fstrace +${DEST}/etc/fstrace: fstrace ${INSTALL} -s $? $@ -${DESTDIR}/bin/cmdebug: cmdebug +${DEST}/bin/cmdebug: cmdebug ${INSTALL} -s $? $@ -${DESTDIR}/etc/kdump: kdump +${DEST}/etc/kdump: kdump -set -x; \ case ${SYS_NAME} in \ sgi_6? ) \ ${INSTALLex} -f kdump.sh.sgi_ipnos $@; \ - ln -fs kdump ${DESTDIR}/etc/kdump32; \ - ln -fs kdump.IP20 ${DESTDIR}/etc/kdump.IP22; \ - ln -fs kdump.IP20 ${DESTDIR}/etc/kdump.IP32; \ + ln -fs kdump ${DEST}/etc/kdump32; \ + ln -fs kdump.IP20 ${DEST}/etc/kdump.IP22; \ + ln -fs kdump.IP20 ${DEST}/etc/kdump.IP32; \ for f in kdump.IP??; \ - do ${INSTALL} -s $$f ${DESTDIR}/etc/$$f || exit $$? ; \ + do ${INSTALL} -s $$f ${DEST}/etc/$$f || exit $$? ; \ done ;; \ sun4x_5[78] ) \ ${INSTALLex} -f kdump.sh.solaris7 $@; \ - ${INSTALL} -s -f $? ${DESTDIR}/etc/kdump32;; \ + ${INSTALL} -s -f $? ${DEST}/etc/kdump32;; \ *linux* ) \ - ${INSTALL} -s kdump-${LINUX_VERSION} ${DESTDIR}/etc/kdump-${LINUX_VERSION} ;; \ + ${INSTALL} -s kdump-${LINUX_VERSION} ${DEST}/etc/kdump-${LINUX_VERSION} ;; \ hp_ux11* ) \ ${INSTALLex} -f kdump.sh.hp_ux11 $@; \ - ${INSTALL} -s -f $? ${DESTDIR}/etc/kdump32;; \ + ${INSTALL} -s -f $? ${DEST}/etc/kdump32;; \ *) \ ${INSTALL} -s $? $@ ;; \ esac -${DESTDIR}/etc/kdump64: kdump64 +${DEST}/etc/kdump64: kdump64 -set -x; \ case ${SYS_NAME} in \ sun4x_5[78] | hp_ux11* ) \ @@ -122,7 +132,7 @@ up: up.o fs.o: fs.c ${INCLS} AFS_component_version_number.c fs: fs.o $(LIBS) - ${CC} ${CFLAGS} -g -o fs fs.o ${DESTDIR}/lib/afs/libprot.a $(LIBS) ${XLIBS} + ${CC} ${CFLAGS} -g -o fs fs.o ${TOP_LIBDIR}/libprot.a $(LIBS) ${XLIBS} twiddle: twiddle.c $(LIBS) ${CC} -g -o twiddle $(CFLAGS) twiddle.c $(LIBS) ${XLIBS} @@ -138,21 +148,21 @@ whatfid: whatfid.o ${LIBS} fstrace.o: fstrace.c AFS_component_version_number.c case ${SYS_NAME} in \ sun4_411 | sun4c_411 | sun4m_412 ) \ - ${CCXPG2} -g -I${TOP_SRCDIR}/config -I${DESTDIR}/include -I${SRCDIR}/include -c fstrace.c ;; \ + ${CCXPG2} -g -I${TOP_SRCDIR}/config -I${TOP_INCDIR} -I${TOP_INCDIR} -c fstrace.c ;; \ * ) \ - ${CC} ${CFLAGS} -g -I${TOP_SRCDIR}/config -I${DESTDIR}/include -I${SRCDIR}/include -c fstrace.c ;; \ + ${CC} ${CFLAGS} -g -I${TOP_SRCDIR}/config -I${TOP_INCDIR} -I${TOP_INCDIR} -c fstrace.c ;; \ esac fstrace: fstrace.o case ${SYS_NAME} in \ pmax_ul43 | pmax_ul43a ) \ - ${CC} ${CFLAGS} -o fstrace fstrace.o ${VLIB}/libsys.a ${VLIB}/libcmd.a ${VLIB}util.a /usr/lib/libi.a ;; \ + ${CC} ${CFLAGS} -o fstrace fstrace.o ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a /usr/lib/libi.a ;; \ sun4_411 | sun4c_411 | sun4m_412 ) \ - ${CCXPG2} ${CFLAGS} -g -o fstrace fstrace.o ${VLIB}/libsys.a ${VLIB}/libcmd.a ${VLIB}util.a ;; \ + ${CCXPG2} ${CFLAGS} -g -o fstrace fstrace.o ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a ;; \ hp700_ux100 | hp800_ux100 | hp?00_ux10? | hp_ux10? | hp_ux11?) \ - ${CC} -I${TOP_SRCDIR}/config -o fstrace fstrace.o ${VLIB}/libsys.a ${VLIB}/libcmd.a ${VLIB}util.a ;; \ + ${CC} -I${TOP_SRCDIR}/config -o fstrace fstrace.o ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a ;; \ * ) \ - ${CC} ${CFLAGS} -o fstrace fstrace.o ${VLIB}/libsys.a ${VLIB}/libcmd.a ${VLIB}util.a ;; \ + ${CC} ${CFLAGS} -o fstrace fstrace.o ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a ;; \ esac cmdebug.o: cmdebug.c ${INCLS} AFS_component_version_number.c @@ -164,9 +174,9 @@ kdump.o: kdump.c ${INCLS} AFS_component_version_number.c -set -x; \ case ${SYS_NAME} in \ alpha_linux* ) \ - ${CC} -g -I${LINUX_KERNEL_PATH}/include -I${DESTDIR}/include -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS} -mno-fp-regs -ffixed-8 -o kdump-${LINUX_VERSION}.o -c kdump.c ;; \ + ${CC} -g -I${LINUX_KERNEL_PATH}/include -I${TOP_INCDIR} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} -mno-fp-regs -ffixed-8 -o kdump-${LINUX_VERSION}.o -c kdump.c ;; \ *linux* ) \ - ${CC} -g -I${LINUX_KERNEL_PATH}/include -I${DESTDIR}/include -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS} -o kdump-${LINUX_VERSION}.o -c kdump.c ;; \ + ${CC} -g -I${LINUX_KERNEL_PATH}/include -I${TOP_INCDIR} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} -o kdump-${LINUX_VERSION}.o -c kdump.c ;; \ alpha_osf1 | alpha_osf20 | alpha_osf30 | alpha_osf32 | alpha_osf32c| alpha_dux?? ) \ ${CC} -g ${CFLAGS} -I/usr/sys/include -I/usr/sys/BINARY -I/usr/sys/AFS -DDEBUGGER -c kdump.c ;;\ sgi_6? ) \ @@ -177,14 +187,14 @@ kdump.o: kdump.c ${INCLS} AFS_component_version_number.c echo CPU_KDEFS = $$CPU_KDEFS; \ case $$CPU_KDEFS in \ *-64*) ${CC} -D_KMEMUSER -woff 1178 \ - -g -I${DESTDIR}/include \ + -g -I${TOP_INCDIR} \ -I${TOP_SRCDIR}/config \ $$CPU_KDEFS \ ${XCFLAGS64} \ -c kdump.c -o kdump.$$IP.o \ ;; \ *) ${CC} -D_KMEMUSER -woff 1178 \ - -g -I${DESTDIR}/include \ + -g -I${TOP_INCDIR} \ -I${TOP_SRCDIR}/config \ $$CPU_KDEFS \ ${XCFLAGS} -DAFS_32BIT_KERNEL_ENV \ @@ -194,23 +204,23 @@ kdump.o: kdump.c ${INCLS} AFS_component_version_number.c done \ ;; \ *) \ - ${CC} -g -I${DESTDIR}/include -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS} -c kdump.c ;; \ + ${CC} -g -I${TOP_INCDIR} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} -c kdump.c ;; \ esac ; kdump64.o : kdump.c ${INCLS} AFS_component_version_number.c -set -x; \ case ${SYS_NAME} in \ sun4x_5[78] | hp_ux11* ) \ - ${CC} -g -I${DESTDIR}/include -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS64} -o kdump64.o -c kdump.c ;; \ + ${CC} -g -I${TOP_INCDIR} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS64} -o kdump64.o -c kdump.c ;; \ esac kdump: kdump.o -set -x; \ case ${SYS_NAME} in \ sun4c_51 | sun4c_52 | sun4m_51 | sun4m_52 | sun4c_53 | sun4m_53 | sun4_53 | sun4_54 | sun4c_54 | sun4m_54 | sunx86_54) \ - ${CC} -g -o kdump kdump.o ${DESTDIR}/lib/afs/libcmd.a ${DESTDIR}/lib/afs/util.a /usr/lib/libkvm.a -lelf ${XLIBS} ;; \ + ${CC} -g -o kdump kdump.o ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a /usr/lib/libkvm.a -lelf ${XLIBS} ;; \ sun4x_5? ) \ - ${CC} -g -o kdump kdump.o ${DESTDIR}/lib/afs/libcmd.a ${DESTDIR}/lib/afs/util.a ${XLIBELFA} ${XLIBKVM} ${XLIBS} ;; \ + ${CC} -g -o kdump kdump.o ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a ${XLIBELFA} ${XLIBKVM} ${XLIBS} ;; \ sgi_6? ) \ for f in ../libafs/STATIC.IP*/CPU_KDEFS; \ do IP=`expr "$$f" : '../libafs/STATIC.\(IP..\)'`; \ @@ -221,21 +231,21 @@ kdump: kdump.o *-64*) ${CC} ${XCFLAGS64} -g \ $$CPU_KDEFS \ -o kdump.$$IP kdump.$$IP.o \ - ${DESTDIR}/lib/afs/libcmd64.a -lelf \ + ${TOP_LIBDIR}/libcmd64.a -lelf \ ;; \ *) ${CC} ${XCFLAGS} -g \ $$CPU_KDEFS \ -o kdump.$$IP kdump.$$IP.o \ - ${DESTDIR}/lib/afs/libcmd.a -lelf \ + ${TOP_LIBDIR}/libcmd.a -lelf \ ;; \ esac || exit $$? ; \ done ;; \ *linux* ) \ - ${CC} -g -o kdump-${LINUX_VERSION} kdump-${LINUX_VERSION}.o ${DESTDIR}/lib/afs/libcmd.a ${DESTDIR}/lib/afs/util.a ${XLIBS} ;; \ + ${CC} -g -o kdump-${LINUX_VERSION} kdump-${LINUX_VERSION}.o ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a ${XLIBS} ;; \ alpha_osf1 | alpha_osf20 | alpha_osf30 | alpha_osf32 | alpha_osf32c | alpha_dux??) \ - ${CC} -g -o kdump kdump.o ${DESTDIR}/lib/afs/libcmd.a ${DESTDIR}/lib/afs/util.a ${XLIBS} -ll -lmld;; \ - ncrx86_* ) ${CC} -g -o kdump kdump.o ${DESTDIR}/lib/afs/libcmd.a ${DESTDIR}/lib/afs/util.a -lelf ${XLIBS} ;; \ - * ) ${CC} -g -o kdump kdump.o ${DESTDIR}/lib/afs/libcmd.a ${DESTDIR}/lib/afs/util.a ${XLIBS} ;; \ + ${CC} -g -o kdump kdump.o ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a ${XLIBS} -ll -lmld;; \ + ncrx86_* ) ${CC} -g -o kdump kdump.o ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a -lelf ${XLIBS} ;; \ + * ) ${CC} -g -o kdump kdump.o ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a ${XLIBS} ;; \ esac ## kdump to read from 64 bit kernel dumps @@ -244,19 +254,20 @@ kdump64 : kdump64.o -set -x; \ case ${SYS_NAME} in \ sun4x_5[78] | hp_ux11* ) \ - ${CC} -g ${XCFLAGS64} -o kdump64 kdump64.o ${DESTDIR}/lib/afs/libcmd64.a ${XLIBELFA} ${XLIBKVM} ${XLIBS} ;; \ + ${CC} -g ${XCFLAGS64} -o kdump64 kdump64.o ${TOP_LIBDIR}/libcmd64.a ${XLIBELFA} ${XLIBKVM} ${XLIBS} ;; \ esac # # Install targets # -install: ${DESTDIR}/bin/fs \ - ${DESTDIR}/root.server/usr/afs/bin/fs \ - ${DESTDIR}/bin/up \ - ${DESTDIR}/etc/fstrace \ - ${DESTDIR}/bin/cmdebug \ - ${DESTDIR}/etc/kdump \ - ${DESTDIR}/etc/kdump64 +install: \ + ${DESTDIR}${bindir}/fs \ + ${DESTDIR}${afssrvbindir}/fs \ + ${DESTDIR}${bindir}/up \ + ${DESTDIR}${sbindir}/fstrace \ + ${DESTDIR}${bindir}/cmdebug \ + ${DESTDIR}${sbindir}/kdump \ + ${DESTDIR}${sbindir}/kdump64 # # Misc targets @@ -270,3 +281,59 @@ test: include ../config/Makefile.version +${DESTDIR}${bindir}/fs: fs + ${INSTALL} -s $? $@ + +${DESTDIR}${afssrvbindir}/fs: fs + ${INSTALL} -s $? $@ + +${DESTDIR}${bindir}/up: up + ${INSTALL} -s $? $@ + +${DESTDIR}${sbindir}/fstrace: fstrace + ${INSTALL} -s $? $@ + +${DESTDIR}${bindir}/cmdebug: cmdebug + ${INSTALL} -s $? $@ + +${DESTDIR}${sbindir}/kdump: kdump + -set -x; \ + case ${SYS_NAME} in \ + sgi_6? ) \ + ${INSTALLex} -f kdump.sh.sgi_ipnos $@; \ + ln -fs kdump ${DESTDIR}${sbindir}/kdump32; \ + ln -fs kdump.IP20 ${DESTDIR}${sbindir}/kdump.IP22; \ + ln -fs kdump.IP20 ${DESTDIR}${sbindir}/kdump.IP32; \ + for f in kdump.IP??; \ + do ${INSTALL} -s $$f ${DESTDIR}${sbindir}/$$f || exit $$? ; \ + done ;; \ + sun4x_5[78] ) \ + ${INSTALLex} -f kdump.sh.solaris7 $@; \ + ${INSTALL} -s -f $? ${DESTDIR}${sbindir}/kdump32;; \ + *linux* ) \ + ${INSTALL} -s kdump-${LINUX_VERSION} ${DESTDIR}${sbindir}/kdump-${LINUX_VERSION} ;; \ + hp_ux11* ) \ + ${INSTALLex} -f kdump.sh.hp_ux11 $@; \ + ${INSTALL} -s -f $? ${DESTDIR}${sbindir}/kdump32;; \ + *) \ + ${INSTALL} -s $? $@ ;; \ + esac + +${DESTDIR}${sbindir}/kdump64: kdump64 + -set -x; \ + case ${SYS_NAME} in \ + sun4x_5[78] | hp_ux11* ) \ + ${INSTALL} -s $? $@ ;;\ + * ) \ + echo skipping kdump64 for ${SYS_NAME} ;; \ + esac + +dest: \ + ${DEST}/bin/fs \ + ${DEST}/root.server/usr/afs/bin/fs \ + ${DEST}/bin/up \ + ${DEST}/etc/fstrace \ + ${DEST}/bin/cmdebug \ + ${DEST}/etc/kdump \ + ${DEST}/etc/kdump64 + diff --git a/src/venus/test/Makefile.in b/src/venus/test/Makefile.in index a695e28..57ec1a7 100644 --- a/src/venus/test/Makefile.in +++ b/src/venus/test/Makefile.in @@ -5,8 +5,22 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -16,13 +30,16 @@ include ../../config/Makefile.${SYS_NAME} OPTIMIZE=-O -INCDIRS= -I${TOP_SRCDIR}/config -I${DESTDIR}/include -I.. -LDIRS= -L${DESTDIR}/lib -L${DESTDIR}/lib/afs -L.. +INCDIRS= -I${TOP_SRCDIR}/config -I${TOP_INCDIR} -I.. +LDIRS= -L${TOP_LIBDIR} -L.. LIBS= -lsys -lubik -lvldb -lauth -lrxkad -ldes -lcom_err -lcmd -lrx -llwp -lafsutil CFLAGS = ${OPTIMIZE} ${INCDIRS} ${XCFLAGS} -install all system test: fulltest owntest idtest getinitparams +all test: fulltest owntest idtest getinitparams + +install: +dest: fulltest: fulltest.o $(CC) $(CFLAGS) -o $@ $@.o $(LDIRS) $(LIBS) diff --git a/src/vfsck/Makefile.in b/src/vfsck/Makefile.in index c786387..ac083d4 100644 --- a/src/vfsck/Makefile.in +++ b/src/vfsck/Makefile.in @@ -16,15 +16,29 @@ # # @(#)Makefile 5.12 (Berkeley) 6/26/89 # -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ include ../config/Makefile.${SYS_NAME} -CFLAGS= ${DBUG} -w -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS} +CFLAGS=${DBUG} -w -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} LIBC= /lib/libc.a SRCS= dir.c inode.c main.c pass1.c pass1b.c pass2.c pass3.c pass4.c \ pass5.c setup.c utilities.c ufs_subr.c ufs_tables.c dirutils.c\ @@ -45,7 +59,7 @@ vfsck: main.o ${OBJS} ${OBJS}: ${SRCS} case ${SYS_NAME} in \ hp_ux11? ) \ - ${CC} -o vfsck -I/usr/old/usr/include ${DBUG} -w -I${SRCDIR}/include ${SRCS} ${NON_SHARED} +DA1.0 -Wl,-a,archive -D_FILE64 \ + ${CC} -o vfsck -I/usr/old/usr/include ${DBUG} -w -I${TOP_INCDIR} ${SRCS} ${NON_SHARED} +DA1.0 -Wl,-a,archive -D_FILE64 \ ;; \ hp?00_ux101 | hp_ux10? ) \ ${CC} -o vfsck ${CFLAGS} ${SRCS} ${NON_SHARED} ${XLIBS} -D_FILE64\ @@ -71,21 +85,31 @@ depend: ${SRCS} system: install -install: all ${MAN} - ${INSTALL} -s -c vfsck ${DESTDIR}/root.server/etc - ${INSTALL} -s -c vfsck ${DESTDIR}/root.server/usr/afs/bin +install: ${DESTDIR}${afssrvlibexecdir}/vfsck + +${DEST}/root.server/etc/vfsck: vfsck + ${INSTALL} $? $@ + +${DEST}/root.server/usr/afs/bin/vfsck: vfsck + ${INSTALL} $? $@ + +${DESTDIR}${afssrvlibexecdir}/vfsck: vfsck + ${INSTALL} $? $@ + + +dest: ${DEST}/root.server/etc/vfsck ${DEST}/root.server/usr/afs/bin/vfsck case ${SYS_NAME} in \ hp_ux10? ) \ - ${CP} bcheckrc ${DESTDIR}/root.server/etc; \ + ${CP} bcheckrc ${DEST}/root.server/etc; \ ;; \ hp_ux11? ) \ - ${CP} bcheckrc-hp_ux110 ${DESTDIR}/root.server/etc/bcheckrc; \ + ${CP} bcheckrc-hp_ux110 ${DEST}/root.server/etc/bcheckrc; \ ;; \ esac case ${SYS_NAME} in \ hp_ux10? | hp_ux11? ) \ - ${CP} mount ${DESTDIR}/root.server/etc ;\ - ${CP} umount ${DESTDIR}/root.server/etc; \ - chmod 755 ${DESTDIR}/root.server/etc/bcheckrc ${DESTDIR}/root.server/etc/mount ${DESTDIR}/root.server/etc/umount ;\ + ${CP} mount ${DEST}/root.server/etc ;\ + ${CP} umount ${DEST}/root.server/etc; \ + chmod 755 ${DEST}/root.server/etc/bcheckrc ${DEST}/root.server/etc/mount ${DEST}/root.server/etc/umount ;\ ;; \ esac diff --git a/src/viced/Makefile.in b/src/viced/Makefile.in index 77d4648..287d9f2 100644 --- a/src/viced/Makefile.in +++ b/src/viced/Makefile.in @@ -5,8 +5,22 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -14,41 +28,41 @@ SHELL = /bin/sh include ../config/Makefile.${SYS_NAME} -CFLAGS = -DNINTERFACE -I${TOP_SRCDIR}/config -I. -I${SRCDIR}/include -I${SRCDIR}/include/afs \ +CFLAGS=-DNINTERFACE -I${TOP_SRCDIR}/config -I. -I${TOP_INCDIR} -I${TOP_INCDIR}/afs \ ${XCFLAGS} -DRXDEBUG LDFLAGS = ${DBUG} ${XLDFLAGS} -LIBS= ${SRCDIR}/lib/afs/libacl.a \ - ${SRCDIR}/lib/afs/libvldb.a \ - ${SRCDIR}/lib/afs/libprot.a \ - ${SRCDIR}/lib/afs/libauth.a \ - ${SRCDIR}/lib/librxkad.a \ - ${SRCDIR}/lib/libubik.a \ - ${SRCDIR}/lib/afs/vlib.a \ - ${SRCDIR}/lib/afs/libdir.a \ - ${SRCDIR}/lib/afs/util.a \ - ${SRCDIR}/lib/afs/libsys.a \ - ${SRCDIR}/lib/afs/libafsint.a \ - ${SRCDIR}/lib/librxstat.a \ - ${SRCDIR}/lib/librx.a \ - ${SRCDIR}/lib/afs/libsys.a \ - ${SRCDIR}/lib/libdes.a \ - ${SRCDIR}/lib/afs/libcom_err.a \ - ${SRCDIR}/lib/afs/util.a \ - ${SRCDIR}/lib/liblwp.a - -headers=${SRCDIR}/include/lwp.h \ - ${SRCDIR}/include/afs/acl.h \ - ${SRCDIR}/include/afs/errors.h \ - ${SRCDIR}/include/afs/ptclient.h \ - ${SRCDIR}/include/lock.h \ - ${SRCDIR}/include/afs/volume.h \ - ${SRCDIR}/include/afs/vnode.h \ - ${SRCDIR}/include/rx/rx.h \ - ${SRCDIR}/include/rx/xdr.h \ - ${SRCDIR}/include/afs/auth.h \ - ${SRCDIR}/include/afs/afsint.h \ +LIBS=${TOP_LIBDIR}/libacl.a \ + ${TOP_LIBDIR}/libvldb.a \ + ${TOP_LIBDIR}/libprot.a \ + ${TOP_LIBDIR}/libauth.a \ + ${TOP_LIBDIR}/librxkad.a \ + ${TOP_LIBDIR}/libubik.a \ + ${TOP_LIBDIR}/vlib.a \ + ${TOP_LIBDIR}/libdir.a \ + ${TOP_LIBDIR}/util.a \ + ${TOP_LIBDIR}/libsys.a \ + ${TOP_LIBDIR}/libafsint.a \ + ${TOP_LIBDIR}/librxstat.a \ + ${TOP_LIBDIR}/librx.a \ + ${TOP_LIBDIR}/libsys.a \ + ${TOP_LIBDIR}/libdes.a \ + ${TOP_LIBDIR}/libcom_err.a \ + ${TOP_LIBDIR}/util.a \ + ${TOP_LIBDIR}/liblwp.a + +headers=${TOP_INCDIR}/lwp.h \ + ${TOP_INCDIR}/afs/acl.h \ + ${TOP_INCDIR}/afs/errors.h \ + ${TOP_INCDIR}/afs/ptclient.h \ + ${TOP_INCDIR}/lock.h \ + ${TOP_INCDIR}/afs/volume.h \ + ${TOP_INCDIR}/afs/vnode.h \ + ${TOP_INCDIR}/rx/rx.h \ + ${TOP_INCDIR}/rx/xdr.h \ + ${TOP_INCDIR}/afs/auth.h \ + ${TOP_INCDIR}/afs/afsint.h \ viced.h \ host.h \ fs_stats.h @@ -59,7 +73,7 @@ objects=viced.o \ physio.o \ callback.o -all: install +all: cbd fsprobe check_sysid fileserver ${TOP_INCDIR}/afs/fs_stats.h ${objects}: ${headers} @@ -73,10 +87,10 @@ fileserver: ${objects} ${headers} ${LIBS} case ${SYS_NAME} in \ rs_aix*) \ ${CC} -K ${LDFLAGS} -o fileserver ${objects} \ - ${SRCDIR}/lib/afs/libaudit.a ${LIBS} ${XLIBS} ;; \ + ${TOP_LIBDIR}/libaudit.a ${LIBS} ${XLIBS} ;; \ *) \ ${CC} ${LDFLAGS} -o fileserver ${objects} \ - ${SRCDIR}/lib/afs/libaudit.a ${LIBS} ${XLIBS} ;; \ + ${TOP_LIBDIR}/libaudit.a ${LIBS} ${XLIBS} ;; \ esac fsprobe.o: fsprobe.c AFS_component_version_number.c @@ -91,22 +105,38 @@ cbd.o: callback.c AFS_component_version_number.c cbd: cbd.o ${CC} ${CFLAGS} -DINTERPRET_DUMP -o cbd cbd.o ${LIBS} ${XLIBS} -${DESTDIR}/root.server/usr/afs/bin/fileserver: fileserver +${DEST}/root.server/usr/afs/bin/fileserver: fileserver @case ${SYS_NAME} in \ alpha_dux4*|*linux*|rs_aix*|sgi_6*|sun4x*) \ echo "Don't install fileserver for ${SYS_NAME}" ;; \ *) \ - echo ${INSTALL} -ns fileserver ${DESTDIR}/root.server/usr/afs/bin/fileserver ; \ - ${INSTALL} -ns fileserver ${DESTDIR}/root.server/usr/afs/bin/fileserver ;; \ + echo ${INSTALL} -ns $? $@ ; \ + ${INSTALL} -ns $? $@ ;; \ esac -${DESTDIR}/include/afs/fs_stats.h: fs_stats.h +${DEST}/include/afs/fs_stats.h: fs_stats.h ${INSTALL} $? $@ -install: cbd fsprobe check_sysid ${DESTDIR}/root.server/usr/afs/bin/fileserver \ - ${DESTDIR}/include/afs/fs_stats.h +install: ${DESTDIR}${afssrvlibexecdir}/fileserver ${DESTDIR}${includedir}/afs/fs_stats.h clean: $(RM) -f *.o fileserver core AFS_component_version_number.c cbd check_sysid fsprobe include ../config/Makefile.version +${DESTDIR}${afssrvlibexecdir}/fileserver: fileserver + @case ${SYS_NAME} in \ + alpha_dux4*|*linux*|rs_aix*|sgi_6*|sun4x*) \ + echo "Don't install fileserver for ${SYS_NAME}" ;; \ + *) \ + echo ${INSTALL} -ns $? $@ ; \ + ${INSTALL} -ns $? $@ ;; \ + esac + +${DESTDIR}${includedir}/afs/fs_stats.h: fs_stats.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/fs_stats.h: fs_stats.h + ${INSTALL} $? $@ + +dest: ${DEST}/root.server/usr/afs/bin/fileserver ${DEST}/include/afs/fs_stats.h + diff --git a/src/vlserver/Makefile.in b/src/vlserver/Makefile.in index 31920f0..8b4daeb 100644 --- a/src/vlserver/Makefile.in +++ b/src/vlserver/Makefile.in @@ -5,8 +5,20 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -16,34 +28,34 @@ include ../config/Makefile.${SYS_NAME} KERNELDIR=../libafs/ UKERNELDIR=../libuafs/ -COMPILE_ET = ${SRCDIR}/bin/compile_et - -CFLAGS = ${DBUG} -I. -I.. -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS} -INCLS=${SRCDIR}/include/ubik.h \ - ${SRCDIR}/include/lwp.h \ - ${SRCDIR}/include/lock.h \ - ${SRCDIR}/include/rx/rx.h \ - ${SRCDIR}/include/rx/xdr.h \ - ${SRCDIR}/include/afs/keys.h \ - ${SRCDIR}/include/afs/cellconfig.h \ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et + +CFLAGS=${DBUG} -I. -I.. -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} +INCLS=${TOP_INCDIR}/ubik.h \ + ${TOP_INCDIR}/lwp.h \ + ${TOP_INCDIR}/lock.h \ + ${TOP_INCDIR}/rx/rx.h \ + ${TOP_INCDIR}/rx/xdr.h \ + ${TOP_INCDIR}/afs/keys.h \ + ${TOP_INCDIR}/afs/cellconfig.h \ vlserver.h vlclient.h vldbint.h -LIBS = \ - ${SRCDIR}/lib/libubik.a \ - ${SRCDIR}/lib/afs/libauth.a \ - ${SRCDIR}/lib/librxkad.a \ - ${SRCDIR}/lib/librxstat.a \ - ${SRCDIR}/lib/librx.a \ - ${SRCDIR}/lib/liblwp.a \ - ${SRCDIR}/lib/libdes.a \ - ${SRCDIR}/lib/afs/libcom_err.a \ - ${SRCDIR}/lib/afs/util.a \ - ${SRCDIR}/lib/afs/libsys.a \ - ${SRCDIR}/lib/afs/util.a - -auditlib=${SRCDIR}/lib/afs/libaudit.a - -RXGEN=${SRCDIR}/bin/rxgen +LIBS=\ + ${TOP_LIBDIR}/libubik.a \ + ${TOP_LIBDIR}/libauth.a \ + ${TOP_LIBDIR}/librxkad.a \ + ${TOP_LIBDIR}/librxstat.a \ + ${TOP_LIBDIR}/librx.a \ + ${TOP_LIBDIR}/liblwp.a \ + ${TOP_LIBDIR}/libdes.a \ + ${TOP_LIBDIR}/libcom_err.a \ + ${TOP_LIBDIR}/util.a \ + ${TOP_LIBDIR}/libsys.a \ + ${TOP_LIBDIR}/util.a + +auditlib=${TOP_LIBDIR}/libaudit.a + +RXGEN=${TOP_SRCDIR}/rxgen/rxgen KSRCS=Kvldbint.cs.c Kvldbint.xdr.c vl_opcodes.h vldbint.h UKSRCS=$(KSRCS) @@ -54,7 +66,13 @@ include ../config/Makefile.version noversion: install -all: +all: kinstall ukinstall \ + vlserver vlclient cnvldb vlserver cnvldb vldb_check \ + ${TOP_LIBDIR}/libvldb.a \ + ${TOP_INCDIR}/afs/vl_opcodes.h \ + ${TOP_INCDIR}/afs/vlserver.h \ + ${TOP_INCDIR}/afs/vldbint.h \ + ${TOP_INCDIR}/afs/cnvldb.h clean: $(RM) -f *.o vlserver vlclient cnvldb vldbint.cs.c vldbint.ss.c \ @@ -64,11 +82,11 @@ clean: vldb_check: vldb_check.c $(CC) ${CFLAGS} -o vldb_check vldb_check.c ${XLIBS} \ - ${DESTDIR}/lib/afs/libcmd.a ${DESTDIR}/lib/afs/util.a + ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a cnvldb: cnvldb.o - $(CC) ${CFLAGS} -o cnvldb cnvldb.o ${XLIBS} ${DESTDIR}/lib/afs/libcmd.a\ - ${DESTDIR}/lib/afs/util.a + $(CC) ${CFLAGS} -o cnvldb cnvldb.o ${XLIBS} ${TOP_LIBDIR}/libcmd.a\ + ${TOP_LIBDIR}/util.a cnvldb.o: cnvldb.c cnvldb.h AFS_component_version_number.o @@ -100,7 +118,7 @@ libvldb.a: $(OBJS) AFS_component_version_number.o $(RANLIB) $@ vlclient: vlclient.o libvldb.a $(LIBS) - $(CC) ${CFLAGS} -o vlclient vlclient.o libvldb.a $(LIBS) ${XLIBS} ${DESTDIR}/lib/afs/libcmd.a + $(CC) ${CFLAGS} -o vlclient vlclient.o libvldb.a $(LIBS) ${XLIBS} ${TOP_LIBDIR}/libcmd.a vlclient.o: vlclient.c ${INCLS} AFS_component_version_number.o @@ -114,24 +132,107 @@ kinstall: $(KSRCS) ${INSTALL} $(KSRCS) ${KERNELDIR}/afsint ukinstall webinstall: ${UKERNELDIR}/afsint $(UKSRCS) - ${INSTALL} $(UKSRCS) ${TKERNELDIR}/afsint + ${INSTALL} $(UKSRCS) ${UKERNELDIR}/afsint ${UKERNELDIR}/afsint: mkdir -p $@ -${DESTDIR}/root.server/usr/afs/bin/vlserver: vlserver - ${INSTALL} vlserver ${DESTDIR}/root.server/usr/afs/bin +${DEST}/root.server/usr/afs/bin/vlserver: vlserver + ${INSTALL} $? $@ -${DESTDIR}/etc/vldb_convert: cnvldb - ${INSTALL} -f cnvldb ${DESTDIR}/etc/vldb_convert +${DEST}/etc/vldb_convert: cnvldb + ${INSTALL} -f $? $@ -install: kinstall ukinstall vlserver vlclient libvldb.a cnvldb ${DESTDIR}/root.server/usr/afs/bin/vlserver ${DESTDIR}/etc/vldb_convert vldb_check - ${INSTALL} libvldb.a ${DESTDIR}/lib/afs - ${INSTALL} vl_opcodes.h vlserver.h vldbint.h ${DESTDIR}/include/afs - ${INSTALL} cnvldb.h ${DESTDIR}/include/afs - ${INSTALL} vldb_check ${DESTDIR}/etc +install: \ + ${DESTDIR}${afssrvlibexecdir}/vlserver \ + ${DESTDIR}${afssrvsbindir}/vldb_convert \ + ${DESTDIR}${libdir}/afs/libvldb.a \ + ${DESTDIR}${includedir}/afs/vl_opcodes.h \ + ${DESTDIR}${includedir}/afs/vlserver.h \ + ${DESTDIR}${includedir}/afs/vldbint.h \ + ${DESTDIR}${includedir}/afs/cnvldb.h \ + ${DESTDIR}${afssrvsbindir}/vldb_check -libinstall: libvldb.a - ${INSTALL} libvldb.a ${DESTDIR}/lib/afs - ${INSTALL} vl_opcodes.h vlserver.h vldbint.h ${DESTDIR}/include/afs - ${INSTALL} cnvldb.h ${DESTDIR}/include/afs +libinstall: \ + ${DESTDIR}${libdir}/afs/libvldb.a \ + ${DESTDIR}${includedir}/afs/vl_opcodes.h \ + ${DESTDIR}${includedir}/afs/vlserver.h \ + ${DESTDIR}${includedir}/afs/vldbint.h \ + ${DESTDIR}${includedir}/afs/cnvldb.h + +${DESTDIR}${afssrvlibexecdir}/vlserver: vlserver + ${INSTALL} $? $@ + +${DESTDIR}${afssrvsbindir}/vldb_convert: cnvldb + ${INSTALL} -f $? $@ + +${DEST}/lib/afs/libvldb.a: libvldb.a + ${INSTALL} $? $@ + +${DESTDIR}${libdir}/afs/libvldb.a: libvldb.a + ${INSTALL} $? $@ + + +${TOP_LIBDIR}/libvldb.a: libvldb.a + ${INSTALL} $? $@ + + +${DEST}/include/afs/vl_opcodes.h: vl_opcodes.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/vl_opcodes.h: vl_opcodes.h + ${INSTALL} $? $@ + + +${TOP_INCDIR}/afs/vl_opcodes.h: vl_opcodes.h + ${INSTALL} $? $@ + + +${DEST}/include/afs/vlserver.h: vlserver.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/vlserver.h: vlserver.h + ${INSTALL} $? $@ + + +${TOP_INCDIR}/afs/vlserver.h: vlserver.h + ${INSTALL} $? $@ + + +${DEST}/include/afs/vldbint.h: vldbint.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/vldbint.h: vldbint.h + ${INSTALL} $? $@ + + +${TOP_INCDIR}/afs/vldbint.h: vldbint.h + ${INSTALL} $? $@ + + +${DEST}/include/afs/cnvldb.h: cnvldb.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/cnvldb.h: cnvldb.h + ${INSTALL} $? $@ + + +${TOP_INCDIR}/afs/cnvldb.h: cnvldb.h + ${INSTALL} $? $@ + + +${DEST}/etc/vldb_check: vldb_check + ${INSTALL} $? $@ + +${DESTDIR}${afssrvsbindir}/vldb_check: vldb_check + ${INSTALL} $? $@ + +dest: \ + ${DEST}/root.server/usr/afs/bin/vlserver \ + ${DEST}/etc/vldb_convert \ + ${DEST}/lib/afs/libvldb.a \ + ${DEST}/include/afs/vl_opcodes.h \ + ${DEST}/include/afs/vlserver.h \ + ${DEST}/include/afs/vldbint.h \ + ${DEST}/include/afs/cnvldb.h \ + ${DEST}/etc/vldb_check diff --git a/src/vol/Makefile.in b/src/vol/Makefile.in index 7f4b7b4..be65cf9 100644 --- a/src/vol/Makefile.in +++ b/src/vol/Makefile.in @@ -5,8 +5,22 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -14,12 +28,12 @@ SHELL=/bin/sh include ../config/Makefile.${SYS_NAME} -INCDIRS= -I${TOP_SRCDIR}/config -I. -I${DESTDIR}/include ${FSINCLUDES} +INCDIRS=-I${TOP_SRCDIR}/config -I. -I${TOP_INCDIR} ${FSINCLUDES} LDFLAGS = ${OPTMZ} ${PROF} ${LDIRS} ${XLDFLAGS} -LIBS= ${DESTDIR}/lib/afs/libcmd.a vlib.a ${SRCDIR}/lib/afs/util.a \ - ${DESTDIR}/lib/afs/libsys.a ${DESTDIR}/lib/afs/libdir.a \ - ${DESTDIR}/lib/liblwp.a ${DESTDIR}/lib/afs/libacl.a ${XLIBS} +LIBS=${TOP_LIBDIR}/libcmd.a vlib.a ${TOP_LIBDIR}/util.a \ + ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/libdir.a \ + ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/libacl.a ${XLIBS} CFLAGS = -D${SYS_NAME} ${OPTMZ} ${INCDIRS} ${XCFLAGS} ${DBG} @@ -32,83 +46,106 @@ VLIBOBJS=vnode.o volume.o vutil.o partition.o fssync.o purge.o \ OBJECTS=${VLIBOBJS} physio.o vol-salvage.o vol-info.o -all: install +all: gi \ + ${TOP_LIBDIR}/vlib.a \ + ${TOP_LIBDIR}/libvlib.a \ + salvager \ + volinfo \ + $(FS_CONV_OSF40D) \ + $(XFS_SIZE_CHECK) \ + $(FS_CONV_SOL26) \ + ${TOP_INCDIR}/afs/nfs.h \ + ${TOP_INCDIR}/afs/vnode.h \ + ${TOP_INCDIR}/afs/viceinode.h \ + ${TOP_INCDIR}/afs/volume.h \ + ${TOP_INCDIR}/afs/voldefs.h \ + ${TOP_INCDIR}/afs/partition.h \ + ${TOP_INCDIR}/afs/fssync.h \ + ${TOP_INCDIR}/afs/ihandle.h \ + ${TOP_INCDIR}/afs/namei_ops.h # # Installation targets # -install: gi \ - ${DESTDIR}/lib/afs/vlib.a \ - ${DESTDIR}/lib/afs/libvlib.a \ - ${DESTDIR}/root.server/usr/afs/bin/salvager \ - ${DESTDIR}/root.server/usr/afs/bin/volinfo \ - $(FS_CONV_OSF40D) \ - $(XFS_SIZE_CHECK) \ - $(FS_CONV_SOL26) \ - ${DESTDIR}/include/afs/nfs.h \ - ${DESTDIR}/include/afs/vnode.h \ - ${DESTDIR}/include/afs/viceinode.h \ - ${DESTDIR}/include/afs/volume.h \ - ${DESTDIR}/include/afs/voldefs.h \ - ${DESTDIR}/include/afs/partition.h \ - ${DESTDIR}/include/afs/fssync.h \ - ${DESTDIR}/include/afs/ihandle.h \ - ${DESTDIR}/include/afs/namei_ops.h - -${DESTDIR}/root.server/usr/afs/bin/salvager: salvager +install: \ + ${DESTDIR}${libdir}/afs/vlib.a \ + ${DESTDIR}${libdir}/afs/libvlib.a \ + ${DESTDIR}${afssrvlibexecdir}/salvager \ + ${DESTDIR}${afssrvsbindir}/volinfo \ + $(install_FS_CONV_OSF40D) \ + $(install_XFS_SIZE_CHECK) \ + $(install_FS_CONV_SOL26) \ + ${DESTDIR}${includedir}/afs/nfs.h \ + ${DESTDIR}${includedir}/afs/vnode.h \ + ${DESTDIR}${includedir}/afs/viceinode.h \ + ${DESTDIR}${includedir}/afs/volume.h \ + ${DESTDIR}${includedir}/afs/voldefs.h \ + ${DESTDIR}${includedir}/afs/partition.h \ + ${DESTDIR}${includedir}/afs/fssync.h \ + ${DESTDIR}${includedir}/afs/ihandle.h \ + ${DESTDIR}${includedir}/afs/namei_ops.h + +${DEST}/root.server/usr/afs/bin/salvager: salvager ${INSTALL} -s $? $@ -${DESTDIR}/root.server/usr/afs/bin/volinfo: volinfo +${DEST}/root.server/usr/afs/bin/volinfo: volinfo ${INSTALL} -s $? $@ -${DESTDIR}/lib/afs/vlib.a: vlib.a +${DEST}/lib/afs/vlib.a: vlib.a ${INSTALL} $? $@ -${DESTDIR}/lib/afs/libvlib.a: vlib.a +${DEST}/lib/afs/libvlib.a: vlib.a ${INSTALL} $? $@ -$(DESTDIR)root.server/usr/afs/bin/fs_conv_dux40D: fs_conv_dux40D +${DESTDIR}/${afssrvsbindir}/fs_conv_dux40D: fs_conv_dux40D + ${INSTALL} -s $? $@ + +${DESTDIR}/${afssrvsbindir}/xfs_size_check: xfs_size_check ${INSTALL} -s $? $@ -$(DESTDIR)root.server/usr/afs/bin/xfs_size_check: xfs_size_check +${DESTDIR}/${afssrvsbindir}/fs_conv_sol26: fs_conv_sol26 ${INSTALL} -s $? $@ -$(DESTDIR)root.server/usr/afs/bin/fs_conv_sol26: fs_conv_sol26 +$(DEST)/root.server/usr/afs/bin/fs_conv_dux40D: fs_conv_dux40D ${INSTALL} -s $? $@ -${DESTDIR}/include/afs/nfs.h: nfs.h +$(DEST)/root.server/usr/afs/bin/xfs_size_check: xfs_size_check + ${INSTALL} -s $? $@ + +$(DEST)/root.server/usr/afs/bin/fs_conv_sol26: fs_conv_sol26 + ${INSTALL} -s $? $@ + +${DEST}/include/afs/nfs.h: nfs.h ${INSTALL} $? $@ -${DESTDIR}/include/afs/vnode.h: vnode.h +${DEST}/include/afs/vnode.h: vnode.h ${INSTALL} $? $@ -${DESTDIR}/include/afs/viceinode.h: viceinode.h +${DEST}/include/afs/viceinode.h: viceinode.h ${INSTALL} $? $@ -${DESTDIR}/include/afs/volume.h: volume.h +${DEST}/include/afs/volume.h: volume.h ${INSTALL} $? $@ -${DESTDIR}/include/afs/voldefs.h: voldefs.h +${DEST}/include/afs/voldefs.h: voldefs.h ${INSTALL} $? $@ -${DESTDIR}/include/afs/partition.h: partition.h +${DEST}/include/afs/partition.h: partition.h ${INSTALL} $? $@ -${DESTDIR}/include/afs/fssync.h: fssync.h +${DEST}/include/afs/fssync.h: fssync.h ${INSTALL} $? $@ -${DESTDIR}/include/afs/ihandle.h: ihandle.h +${DEST}/include/afs/ihandle.h: ihandle.h ${INSTALL} $? $@ -${DESTDIR}/include/afs/namei_ops.h: namei_ops.h +${DEST}/include/afs/namei_ops.h: namei_ops.h ${INSTALL} $? $@ # # Build targets # -${OBJECTS}: ${PUBLICHEADERS} ${SRCDIR}/include/lwp.h ${SRCDIR}/include/lock.h \ - ${SRCDIR}/include/afs/afsint.h vutils.h salvage.h\ - AFS_component_version_number.c +${OBJECTS}: ${PUBLICHEADERS} ${TOP_INCDIR}/lwp.h ${TOP_INCDIR}/lock.h ${TOP_INCDIR}/afs/afsint.h vutils.h salvage.h AFS_component_version_number.c vol-salvage.o vutil.o: volinodes.h @@ -133,13 +170,13 @@ listinodes.o: listinodes.c AFS_component_version_number.c ;; \ esac -gi: ${DESTDIR}/lib/afs/libsys.a +gi: ${TOP_LIBDIR}/libsys.a case ${SYS_NAME} in \ *linux* | sgi_* | *fbsd* ) \ echo "Don't build gi on ${SYS_NAME}";; \ *) \ ${CC} ${CFLAGS} -c gi.c ; \ - ${CC} ${LDFLAGS} -o gi gi.o ${DESTDIR}/lib/afs/libsys.a;; \ + ${CC} ${LDFLAGS} -o gi gi.o ${TOP_LIBDIR}/libsys.a;; \ esac volinfo: vol-info.o physio.o ihandle.o @@ -154,10 +191,10 @@ volinfo: vol-info.o physio.o ihandle.o fs_conv_dux40D: fs_conv_411.o - ${CC} ${CFLAGS} ${DESTDIR}/lib/afs/libcmd.a -o fs_conv_dux40D fs_conv_411.o ${LIBS} + ${CC} ${CFLAGS} ${TOP_LIBDIR}/libcmd.a -o fs_conv_dux40D fs_conv_411.o ${LIBS} fs_conv_sol26: fs_conv_411.o vlib.a - ${CC} ${CFLAGS} ${DESTDIR}/lib/afs/libcmd.a -o fs_conv_sol26 fs_conv_411.o ${LIBS} + ${CC} ${CFLAGS} ${TOP_LIBDIR}/libcmd.a -o fs_conv_sol26 fs_conv_411.o ${LIBS} fs_conv_411.o: fs_conv_411.c AFS_component_version_number.c ${CC} ${CFLAGS} -c fs_conv_411.c @@ -176,3 +213,93 @@ test: cd test; $(MAKE) include ../config/Makefile.version +${DESTDIR}${libdir}/afs/vlib.a: vlib.a + ${INSTALL} $? $@ + +${TOP_LIBDIR}/vlib.a: vlib.a + ${INSTALL} $? $@ + +${DESTDIR}${libdir}/afs/libvlib.a: vlib.a + ${INSTALL} $? $@ + +${TOP_LIBDIR}/libvlib.a: vlib.a + ${INSTALL} $? $@ + +${DESTDIR}${afssrvlibexecdir}/salvager: salvager + ${INSTALL} -s $? $@ + +${DESTDIR}${afssrvsbindir}/volinfo: volinfo + ${INSTALL} -s $? $@ + +${DESTDIR}${includedir}/afs/nfs.h: nfs.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/nfs.h: nfs.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/vnode.h: vnode.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/vnode.h: vnode.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/viceinode.h: viceinode.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/viceinode.h: viceinode.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/volume.h: volume.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/volume.h: volume.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/voldefs.h: voldefs.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/voldefs.h: voldefs.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/partition.h: partition.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/partition.h: partition.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/fssync.h: fssync.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/fssync.h: fssync.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/ihandle.h: ihandle.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/ihandle.h: ihandle.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/namei_ops.h: namei_ops.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/namei_ops.h: namei_ops.h + ${INSTALL} $? $@ + +dest: \ + ${DEST}/lib/afs/vlib.a \ + ${DEST}/lib/afs/libvlib.a \ + ${DEST}/root.server/usr/afs/bin/salvager \ + ${DEST}/root.server/usr/afs/bin/volinfo \ + $(dest_FS_CONV_OSF40D) \ + $(dest_XFS_SIZE_CHECK) \ + $(dest_FS_CONV_SOL26) \ + ${DEST}/include/afs/nfs.h \ + ${DEST}/include/afs/vnode.h \ + ${DEST}/include/afs/viceinode.h \ + ${DEST}/include/afs/volume.h \ + ${DEST}/include/afs/voldefs.h \ + ${DEST}/include/afs/partition.h \ + ${DEST}/include/afs/fssync.h \ + ${DEST}/include/afs/ihandle.h \ + ${DEST}/include/afs/namei_ops.h + diff --git a/src/vol/test/Makefile.in b/src/vol/test/Makefile.in index be4d1cc..9dadbda 100644 --- a/src/vol/test/Makefile.in +++ b/src/vol/test/Makefile.in @@ -5,8 +5,22 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -14,16 +28,16 @@ SHELL=/bin/sh include ../../config/Makefile.${SYS_NAME} -INCDIRS= -I. -I.. -I${DESTDIR}/include ${FSINCLUDES} +INCDIRS=-I. -I.. -I${TOP_INCDIR} ${FSINCLUDES} INSTALL = ${SRCDIR}/bin/install LDFLAGS = ${OPTMZ} ${PROF} ${LDIRS} ${XLDFLAGS} -LIBS= ${DESTDIR}/lib/afs/libcmd.a ${DESTDIR}/lib/afs/vlib.a \ - ${SRCDIR}/lib/afs/util.a \ - ${DESTDIR}/lib/afs/libsys.a ${DESTDIR}/lib/afs/libdir.a \ - ${DESTDIR}/lib/liblwp.a ${DESTDIR}/lib/afs/libacl.a ${XLIBS} +LIBS=${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/vlib.a \ + ${TOP_LIBDIR}/util.a \ + ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/libdir.a \ + ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/libacl.a ${XLIBS} -NAMEI_LIBS = ../vlib.a ${SRCDIR}/lib/afs/util.a ${DESTDIR}/lib/liblwp.a +NAMEI_LIBS=../vlib.a ${TOP_LIBDIR}/util.a ${TOP_LIBDIR}/liblwp.a CFLAGS = -D${SYS_NAME} ${OPTMZ} ${INCDIRS} ${XCFLAGS} -g @@ -34,17 +48,14 @@ PUBLICHEADERS=../nfs.h ../vnode.h ../viceinode.h ../volume.h ../vldb.h \ OBJECTS=listVicepx.o utilities.o updateDirInode.o -all system: install +all: listVicepx updateDirInode testpart kinstall: @echo No kernel source here. -install: listVicepx updateDirInode testpart +install: -${OBJECTS}: ${PUBLICHEADERS} ${SRCDIR}/include/lwp.h \ - ${SRCDIR}/include/lock.h ${SRCDIR}/include/afs/afsint.h \ - ../filesignal.h ../vutils.h ../vldb.h ../salvage.h \ - ../volinodes.h ../qiin.h +${OBJECTS}: ${PUBLICHEADERS} ${TOP_INCDIR}/lwp.h ${TOP_INCDIR}/lock.h ${TOP_INCDIR}/afs/afsint.h ../filesignal.h ../vutils.h ../vldb.h ../salvage.h ../volinodes.h ../qiin.h listVicepx.o: listVicepx.c utilities.c ${CC} ${CFLAGS} -c listVicepx.c @@ -52,8 +63,8 @@ listVicepx.o: listVicepx.c utilities.c testpart: testpart.c ../vlib.a ${CC} ${CFLAGS} ${LDFLAGS} -o $@ testpart.c \ - ${DESTDIR}/lib/afs/vlib.a ${DESTDIR}/lib/liblwp.a \ - ${DESTDIR}/lib/afs/util.a ${XLIBS} + ${TOP_LIBDIR}/vlib.a ${TOP_LIBDIR}/liblwp.a \ + ${TOP_LIBDIR}/util.a ${XLIBS} listVicepx: listVicepx.o utilities.o @@ -79,8 +90,10 @@ nilist: nilist.o nsubr.o ${CC} ${CFLAGS} -o nilist nilist.o nsubr.o ${NAMEI_LIBS} nino: nino.o - ${CC} ${CFLAGS} -o nino nino.o ${DESTDIR}/lib/afs/util.a + ${CC} ${CFLAGS} -o nino nino.o ${TOP_LIBDIR}/util.a clean: $(RM) -f *.o *.a $(RM) -f ${SCMPROGS} ${STAGEPROGS} core listVicepx updateDirInode +dest: + diff --git a/src/volser/Makefile.in b/src/volser/Makefile.in index 7b674eb..07495f1 100644 --- a/src/volser/Makefile.in +++ b/src/volser/Makefile.in @@ -5,8 +5,20 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -14,59 +26,62 @@ SHELL=/bin/sh include ../config/Makefile.${SYS_NAME} -COMPILE_ET=${SRCDIR}/bin/compile_et -RXGEN=${SRCDIR}/bin/rxgen +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen -CFLAGS=${DBG} ${OPTMZ} -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS} +CFLAGS=${DBG} ${OPTMZ} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} LDFLAGS=${DBG} ${OPTMZ} ${XLDFLAGS} -INCDIRS= -I${TOP_SRCDIR}/config -I${SRCDIR}/include/afs -I${SRCDIR}/include -INCLIBS=-L${SRCDIR}/lib/afs -L${SRCDIR}/lib +INCDIRS=-I${TOP_SRCDIR}/config -I${TOP_INCDIR}/afs -I${TOP_INCDIR} +INCLIBS=-L${SRCDIR}/lib/afs -L${TOP_LIBDIR} -VINCLS=${SRCDIR}/include/afs/partition.h ${SRCDIR}/include/afs/volume.h \ - ${SRCDIR}/include/afs/vlserver.h vol.h dump.h volser.h lockdata.h +VINCLS=${TOP_INCDIR}/afs/partition.h ${TOP_INCDIR}/afs/volume.h \ + ${TOP_INCDIR}/afs/vlserver.h vol.h dump.h volser.h lockdata.h -RINCLS=${SRCDIR}/include/rx/rx.h ${SRCDIR}/include/rx/xdr.h \ - ${SRCDIR}/include/afs/keys.h ${SRCDIR}/include/afs/cellconfig.h \ - ${SRCDIR}/include/ubik.h ${SRCDIR}/include/afs/cmd.h +RINCLS=${TOP_INCDIR}/rx/rx.h ${TOP_INCDIR}/rx/xdr.h \ + ${TOP_INCDIR}/afs/keys.h ${TOP_INCDIR}/afs/cellconfig.h \ + ${TOP_INCDIR}/ubik.h ${TOP_INCDIR}/afs/cmd.h INTINCLS=volint.h volser.h -LIBS= \ - ${SRCDIR}/lib/afs/libaudit.a \ - ${SRCDIR}/lib/afs/vlib.a \ - ${SRCDIR}/lib/afs/libacl.a \ - ${SRCDIR}/lib/afs/libsys.a \ - ${SRCDIR}/lib/afs/libvldb.a \ - ${SRCDIR}/lib/libubik.a \ - ${SRCDIR}/lib/afs/libauth.a \ - ${SRCDIR}/lib/afs/libcmd.a \ - ${SRCDIR}/lib/librxkad.a \ - ${SRCDIR}/lib/libdes.a \ - ${SRCDIR}/lib/librxstat.a \ - ${SRCDIR}/lib/librx.a \ - ${SRCDIR}/lib/liblwp.a \ - ${SRCDIR}/lib/afs/libsys.a \ - ${SRCDIR}/lib/afs/libcom_err.a \ - ${SRCDIR}/lib/afs/libkauth.a \ - ${SRCDIR}/lib/afs/libusd.a \ - ${SRCDIR}/lib/afs/util.a +LIBS=\ + ${TOP_LIBDIR}/libaudit.a \ + ${TOP_LIBDIR}/vlib.a \ + ${TOP_LIBDIR}/libacl.a \ + ${TOP_LIBDIR}/libsys.a \ + ${TOP_LIBDIR}/libvldb.a \ + ${TOP_LIBDIR}/libubik.a \ + ${TOP_LIBDIR}/libauth.a \ + ${TOP_LIBDIR}/libcmd.a \ + ${TOP_LIBDIR}/librxkad.a \ + ${TOP_LIBDIR}/libdes.a \ + ${TOP_LIBDIR}/librxstat.a \ + ${TOP_LIBDIR}/librx.a \ + ${TOP_LIBDIR}/liblwp.a \ + ${TOP_LIBDIR}/libsys.a \ + ${TOP_LIBDIR}/libcom_err.a \ + ${TOP_LIBDIR}/libkauth.a \ + ${TOP_LIBDIR}/libusd.a \ + ${TOP_LIBDIR}/util.a VSOBJS=vsprocs.o vsutils.o lockprocs.o volint.xdr.o volerr.o SOBJS=volmain.o volprocs.o physio.o common.o voltrans.o volerr.o \ volint.cs.o dumpstuff.o volint.ss.o volint.xdr.o -all: install +all: volserver vos restorevol \ + ${TOP_INCDIR}/afs/volser.h \ + ${TOP_INCDIR}/afs/volint.h \ + ${TOP_LIBDIR}/libvolser.a restorevol: restorevol.c ${CC} ${CFLAGS} -o restorevol restorevol.c \ - ${SRCDIR}/lib/afs/libcmd.a ${SRCDIR}/lib/afs/util.a + ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a vos: vos.o ${VSOBJS} libvolser.a ${LIBS} ${CC} ${LDFLAGS} -o vos vos.o $(VSOBJS) libvolser.a ${LIBS} ${XLIBS} -volserver: $(SOBJS) $(LIBS) ${SRCDIR}/lib/afs/libdir.a - ${CC} ${DBUG} -o volserver $(SOBJS) ${SRCDIR}/lib/afs/libdir.a \ +volserver: $(SOBJS) $(LIBS) ${TOP_LIBDIR}/libdir.a + ${CC} ${DBUG} -o volserver $(SOBJS) ${TOP_LIBDIR}/libdir.a \ ${LDFLAGS} $(LIBS) ${XLIBS} libvolser.a: volint.cs.o $(VSOBJS) volint.ss.o AFS_component_version_number.o @@ -101,32 +116,32 @@ lockprocs.o: lockprocs.c ${VINCLS} ${INTINCLS} ${RINCLS} # # Installation targets # -install: volserver vos restorevol \ - ${DESTDIR}/etc/restorevol \ - ${DESTDIR}/include/afs/volser.h \ - ${DESTDIR}/include/afs/volint.h \ - ${DESTDIR}/etc/vos \ - ${DESTDIR}/root.server/usr/afs/bin/vos \ - ${DESTDIR}/root.server/usr/afs/bin/volserver \ - ${DESTDIR}/lib/afs/libvolser.a +install: \ + ${DESTDIR}${sbindir}/restorevol \ + ${DESTDIR}${includedir}/afs/volser.h \ + ${DESTDIR}${includedir}/afs/volint.h \ + ${DESTDIR}${sbindir}/vos \ + ${DESTDIR}${afssrvsbindir}/vos \ + ${DESTDIR}${afssrvlibexecdir}/volserver \ + ${DESTDIR}${libdir}/afs/libvolser.a -${DESTDIR}/include/afs/volser.h: volser.h +${DEST}/include/afs/volser.h: volser.h ${INSTALL} $? $@ -${DESTDIR}/include/afs/volint.h: volint.h +${DEST}/include/afs/volint.h: volint.h ${INSTALL} $? $@ -${DESTDIR}/etc/restorevol: restorevol +${DEST}/etc/restorevol: restorevol ${INSTALL} $? $@ -${DESTDIR}/etc/vos ${DESTDIR}/root.server/usr/afs/bin/vos: vos +${DEST}/etc/vos ${DEST}/root.server/usr/afs/bin/vos: vos ${INSTALL} $? $@ -${DESTDIR}/lib/afs/libvolser.a: libvolser.a +${DEST}/lib/afs/libvolser.a: libvolser.a ${INSTALL} $? $@ -${DESTDIR}/root.server/usr/afs/bin/volserver: volserver +${DEST}/root.server/usr/afs/bin/volserver: volserver ${INSTALL} $? $@ # @@ -138,3 +153,42 @@ clean: include ../config/Makefile.version +${DESTDIR}${sbindir}/restorevol: restorevol + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/volser.h: volser.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/volser.h: volser.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/volint.h: volint.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/volint.h: volint.h + ${INSTALL} $? $@ + +${DESTDIR}${sbindir}/vos: vos + ${INSTALL} $? $@ + +${DESTDIR}${afssrvsbindir}/vos: vos + ${INSTALL} $? $@ + +${DESTDIR}${afssrvlibexecdir}/volserver: volserver + ${INSTALL} $? $@ + +${DESTDIR}${libdir}/afs/libvolser.a: libvolser.a + ${INSTALL} $? $@ + +${TOP_LIBDIR}/libvolser.a: libvolser.a + ${INSTALL} $? $@ + +dest: \ + ${DEST}/etc/restorevol \ + ${DEST}/include/afs/volser.h \ + ${DEST}/include/afs/volint.h \ + ${DEST}/etc/vos \ + ${DEST}/root.server/usr/afs/bin/vos \ + ${DEST}/root.server/usr/afs/bin/volserver \ + ${DEST}/lib/afs/libvolser.a + diff --git a/src/wsadmin.src/Makefile.in b/src/wsadmin.src/Makefile.in index 91426ee..0b192d3 100644 --- a/src/wsadmin.src/Makefile.in +++ b/src/wsadmin.src/Makefile.in @@ -1,3 +1,4 @@ +##XLATE_MANUAL## # # Makefile for the wsadmin src directory, the place where package files # are generated. diff --git a/src/xstat/Makefile.in b/src/xstat/Makefile.in index a9ceefe..81cb339 100644 --- a/src/xstat/Makefile.in +++ b/src/xstat/Makefile.in @@ -8,8 +8,22 @@ # Makefile for the module providing the client side of the File Server # and Cache Manager extended statistics gathering. -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libexecdir=@libexecdir@ +libdir=@libdir@ +includedir=@includedir@ +mandir=@mandir@ +afssrvbindir=@afssrvbindir@ +afssrvsbindir=@afssrvsbindir@ +afssrvlibexecdir=@afssrvlibexecdir@ +COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et +RXGEN=${TOP_SRCDIR}/rxgen/rxgen TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ @@ -17,23 +31,28 @@ SHELL = /bin/sh include ../config/Makefile.${SYS_NAME} -CFLAGS= ${DBUG} -I. \ +CFLAGS=${DBUG} -I. \ -I${TOP_SRCDIR}/config \ - -I${SRCDIR}/include \ - -I${SRCDIR}/include/afs \ - -I${SRCDIR} \ + -I${TOP_INCDIR} \ + -I${TOP_INCDIR}/afs \ -I/usr/include ${XCFLAGS} -RPCINCLS=${SRCDIR}/include/lwp.h ${SRCDIR}/include/rx/rx.h +RPCINCLS=${TOP_INCDIR}/lwp.h ${TOP_INCDIR}/rx/rx.h -LIBS= ${SRCDIR}/lib/afs/libafsint.a \ - ${SRCDIR}/lib/afs/libcmd.a \ - ${SRCDIR}/lib/librx.a \ - ${SRCDIR}/lib/liblwp.a \ - ${SRCDIR}/lib/afs/libsys.a \ - ${SRCDIR}/lib/afs/util.a +LIBS=${TOP_LIBDIR}/libafsint.a \ + ${TOP_LIBDIR}/libcmd.a \ + ${TOP_LIBDIR}/librx.a \ + ${TOP_LIBDIR}/liblwp.a \ + ${TOP_LIBDIR}/libsys.a \ + ${TOP_LIBDIR}/util.a -all: install +all: \ + ${TOP_INCDIR}/afs/xstat_fs.h \ + ${TOP_INCDIR}/afs/xstat_cm.h \ + ${TOP_LIBDIR}/libxstat_fs.a \ + ${TOP_LIBDIR}/libxstat_cm.a \ + xstat_fs_test \ + xstat_cm_test # # File Server data collection @@ -75,29 +94,29 @@ xstat_cm_test: xstat_cm_test.o libxstat_cm.a ${LIBS} # Installation targets # install: \ - ${DESTDIR}/include/afs/xstat_fs.h \ - ${DESTDIR}/include/afs/xstat_cm.h \ - ${DESTDIR}/lib/afs/libxstat_fs.a \ - ${DESTDIR}/lib/afs/libxstat_cm.a \ - ${DESTDIR}/bin/xstat_fs_test \ - ${DESTDIR}/bin/xstat_cm_test - -${DESTDIR}/include/afs/xstat_fs.h: xstat_fs.h + ${DESTDIR}${includedir}/afs/xstat_fs.h \ + ${DESTDIR}${includedir}/afs/xstat_cm.h \ + ${DESTDIR}${libdir}/afs/libxstat_fs.a \ + ${DESTDIR}${libdir}/afs/libxstat_cm.a \ + ${DESTDIR}${bindir}/xstat_fs_test \ + ${DESTDIR}${bindir}/xstat_cm_test + +${DEST}/include/afs/xstat_fs.h: xstat_fs.h ${INSTALL} $? $@ -${DESTDIR}/include/afs/xstat_cm.h: xstat_cm.h +${DEST}/include/afs/xstat_cm.h: xstat_cm.h ${INSTALL} $? $@ -${DESTDIR}/lib/afs/libxstat_fs.a: libxstat_fs.a +${DEST}/lib/afs/libxstat_fs.a: libxstat_fs.a ${INSTALL} $? $@ -${DESTDIR}/lib/afs/libxstat_cm.a: libxstat_cm.a +${DEST}/lib/afs/libxstat_cm.a: libxstat_cm.a ${INSTALL} $? $@ -${DESTDIR}/bin/xstat_fs_test: xstat_fs_test +${DEST}/bin/xstat_fs_test: xstat_fs_test ${INSTALL} $? $@ -${DESTDIR}/bin/xstat_cm_test: xstat_cm_test +${DEST}/bin/xstat_cm_test: xstat_cm_test ${INSTALL} $? $@ # @@ -108,3 +127,41 @@ clean: include ../config/Makefile.version +${DESTDIR}${includedir}/afs/xstat_fs.h: xstat_fs.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/xstat_fs.h: xstat_fs.h + ${INSTALL} $? $@ + +${DESTDIR}${includedir}/afs/xstat_cm.h: xstat_cm.h + ${INSTALL} $? $@ + +${TOP_INCDIR}/afs/xstat_cm.h: xstat_cm.h + ${INSTALL} $? $@ + +${DESTDIR}${libdir}/afs/libxstat_fs.a: libxstat_fs.a + ${INSTALL} $? $@ + +${TOP_LIBDIR}/libxstat_fs.a: libxstat_fs.a + ${INSTALL} $? $@ + +${DESTDIR}${libdir}/afs/libxstat_cm.a: libxstat_cm.a + ${INSTALL} $? $@ + +${TOP_LIBDIR}/libxstat_cm.a: libxstat_cm.a + ${INSTALL} $? $@ + +${DESTDIR}${bindir}/xstat_fs_test: xstat_fs_test + ${INSTALL} $? $@ + +${DESTDIR}${bindir}/xstat_cm_test: xstat_cm_test + ${INSTALL} $? $@ + +dest: \ + ${DEST}/include/afs/xstat_fs.h \ + ${DEST}/include/afs/xstat_cm.h \ + ${DEST}/lib/afs/libxstat_fs.a \ + ${DEST}/lib/afs/libxstat_cm.a \ + ${DEST}/bin/xstat_fs_test \ + ${DEST}/bin/xstat_cm_test +