[13610] in Athena Bugs
emacs-19.28 relies on /srvd
daemon@ATHENA.MIT.EDU (epeisach@MIT.EDU)
Sun Jun 25 16:25:32 1995
From: epeisach@MIT.EDU
Date: Sun, 25 Jun 1995 16:25:23 -0400
To: bugs@MIT.EDU, rel-eng@MIT.EDU
The way things are currently configured, the make install process
relinks the executable if DESTDIR is set. This is because a
configuiration file changes and ht ebuild process detects and rebuilds.
On the build machines, /usr/athena/... is the new srvd so this wins, but
it could later be bad. The following changes fix this problem but
putting the DESTDIR in the proper place so as to not cause a relink on
install...
Ezra
*** 1.1 1995/03/11 21:28:56
--- Makefile.in 1995/03/20 19:28:14
***************
*** 72,78 ****
# Where to install Emacs and other binaries that people will want to
# run directly (like etags).
! bindir=${DESTDIR}@bindir@
# Where to install architecture-independent data files. ${lispdir}
# and ${etcdir} are subdirectories of this.
--- 72,78 ----
# Where to install Emacs and other binaries that people will want to
# run directly (like etags).
! bindir=@bindir@
# Where to install architecture-independent data files. ${lispdir}
# and ${etcdir} are subdirectories of this.
***************
*** 90,96 ****
libdir=@libdir@
# Where to install Emacs's man pages, and what extension they should have.
! mandir=${DESTDIR}@mandir@
manext=.1
# Where to install and expect the info files describing Emacs. In the
--- 90,96 ----
libdir=@libdir@
# Where to install Emacs's man pages, and what extension they should have.
! mandir=@mandir@
manext=.1
# Where to install and expect the info files describing Emacs. In the
***************
*** 97,103 ****
# past, this defaulted to a subdirectory of ${prefix}/lib/emacs, but
# since there are now many packages documented with the texinfo
# system, it is inappropriate to imply that it is part of Emacs.
! infodir=${DESTDIR}@infodir@
# Where to find the source code. The source code for Emacs's C kernel is
# expected to be in ${srcdir}/src, and the source code for Emacs's
--- 97,103 ----
# past, this defaulted to a subdirectory of ${prefix}/lib/emacs, but
# since there are now many packages documented with the texinfo
# system, it is inappropriate to imply that it is part of Emacs.
! infodir=@infodir@
# Where to find the source code. The source code for Emacs's C kernel is
# expected to be in ${srcdir}/src, and the source code for Emacs's
***************
*** 117,129 ****
# Emacs. This includes the Emacs version, so that the
# lisp files for different versions of Emacs will install
# themselves in separate directories.
! lispdir=${DESTDIR}@lispdir@
# Directories Emacs should search for lisp files specific
# to this site (i.e. customizations), before consulting
# ${lispdir}. This should be a colon-separated list of
# directories.
! locallisppath=${DESTDIR}@locallisppath@
# Where Emacs will search to find its lisp files. Before
# changing this, check to see if your purpose wouldn't
--- 117,129 ----
# Emacs. This includes the Emacs version, so that the
# lisp files for different versions of Emacs will install
# themselves in separate directories.
! lispdir=@lispdir@
# Directories Emacs should search for lisp files specific
# to this site (i.e. customizations), before consulting
# ${lispdir}. This should be a colon-separated list of
# directories.
! locallisppath=@locallisppath@
# Where Emacs will search to find its lisp files. Before
# changing this, check to see if your purpose wouldn't
***************
*** 148,154 ****
# usually contains the Emacs version number, so the data
# files for multiple versions of Emacs may be installed
# at once.
! etcdir=${DESTDIR}@etcdir@
# Where to create and expect the locking directory, where
# the Emacs locking code keeps track of which files are
--- 148,154 ----
# usually contains the Emacs version number, so the data
# files for multiple versions of Emacs may be installed
# at once.
! etcdir=@etcdir@
# Where to create and expect the locking directory, where
# the Emacs locking code keeps track of which files are
***************
*** 160,169 ****
# and configuration name, so that multiple configurations
# for multiple versions of Emacs may be installed at
# once.
! archlibdir=${DESTDIR}@archlibdir@
# Where to put the docstring file.
! docdir=${DESTDIR}@docdir@
# ==================== Utility Programs for the Build ====================
--- 160,169 ----
# and configuration name, so that multiple configurations
# for multiple versions of Emacs may be installed at
# once.
! archlibdir=@archlibdir@
# Where to put the docstring file.
! docdir=@docdir@
# ==================== Utility Programs for the Build ====================
***************
*** 191,197 ****
# avoid nuking an existing dir file, so we don't do that here;
# instead, we have written out explicit code in the `install' targets.
COPYDIR = ${srcdir}/etc ${srcdir}/lisp
! COPYDESTS = ${etcdir} ${lispdir}
all: paths-force ${SUBDIR}
--- 191,197 ----
# avoid nuking an existing dir file, so we don't do that here;
# instead, we have written out explicit code in the `install' targets.
COPYDIR = ${srcdir}/etc ${srcdir}/lisp
! COPYDESTS = ${DESTDIR}${etcdir} ${DESTDIR}${lispdir}
all: paths-force ${SUBDIR}
***************
*** 246,255 ****
${SUBDIR}: ${SUBDIR_MAKEFILES} FRC
cd $@; $(MAKE) all $(MFLAGS) \
CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}' \
! LDFLAGS='${LDFLAGS}' MAKE='${MAKE}'
blessmail: ${SUBDIR_MAKEFILES} src FRC
! cd lib-src; $(MAKE) maybe-blessmail $(MFLAGS) MAKE='${MAKE}'
Makefile: Makefile.in config.status
./config.status
--- 246,255 ----
${SUBDIR}: ${SUBDIR_MAKEFILES} FRC
cd $@; $(MAKE) all $(MFLAGS) \
CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}' \
! LDFLAGS='${LDFLAGS}' MAKE='${MAKE}' DESTDIR=${DESTDIR}
blessmail: ${SUBDIR_MAKEFILES} src FRC
! cd lib-src; $(MAKE) maybe-blessmail $(MFLAGS) MAKE='${MAKE}' DESTDIR=${DESTDIR}
Makefile: Makefile.in config.status
./config.status
***************
*** 290,302 ****
### as well as lots of things from ${srcdir}/etc.
install-arch-dep: mkdir
(cd lib-src; \
! $(MAKE) install $(MFLAGS) prefix=${prefix} \
exec_prefix=${exec_prefix} bindir=${bindir} libdir=${libdir} \
archlibdir=${archlibdir})
! ${INSTALL_PROGRAM} src/emacs ${bindir}/emacs-${version}
! -chmod 1755 ${bindir}/emacs-${version}
! rm -f ${bindir}/$(EMACS)
! -ln ${bindir}/emacs-${version} ${bindir}/$(EMACS)
### Note that we copy the DOC-* files from the build etc directory
### as well as lots of things from ${srcdir}/etc.
--- 290,302 ----
### as well as lots of things from ${srcdir}/etc.
install-arch-dep: mkdir
(cd lib-src; \
! $(MAKE) install $(MFLAGS) DESTDIR=${DESTDIR} prefix=${prefix} \
exec_prefix=${exec_prefix} bindir=${bindir} libdir=${libdir} \
archlibdir=${archlibdir})
! ${INSTALL_PROGRAM} src/emacs ${DESTDIR}${bindir}/emacs-${version}
! -chmod 1755 ${DESTDIR}${bindir}/emacs-${version}
! rm -f ${DESTDIR}${bindir}/$(EMACS)
! -ln ${DESTDIR}${bindir}/emacs-${version} ${DESTDIR}${bindir}/$(EMACS)
### Note that we copy the DOC-* files from the build etc directory
### as well as lots of things from ${srcdir}/etc.
***************
*** 315,321 ****
[ -d $${dir} ] \
&& [ `(cd $${dir} && /bin/pwd)` != `(cd $${dest} && /bin/pwd)` ] \
&& (echo "Copying $${dir}..." ; \
! (cd $${dir}; tar -cf - . )|(cd $${dest};umask 022; tar -xvf - ); \
for subdir in `find $${dest} -type d ! -name RCS -print` ; do \
rm -rf $${subdir}/RCS ; \
rm -rf $${subdir}/CVS ; \
--- 315,321 ----
[ -d $${dir} ] \
&& [ `(cd $${dir} && /bin/pwd)` != `(cd $${dest} && /bin/pwd)` ] \
&& (echo "Copying $${dir}..." ; \
! (cd $${dir}; tar -chf - . )|(cd $${dest};umask 022; tar -xvf - ); \
for subdir in `find $${dest} -type d ! -name RCS -print` ; do \
rm -rf $${subdir}/RCS ; \
rm -rf $${subdir}/CVS ; \
***************
*** 323,346 ****
rm -f $${subdir}/*~ ; \
done) ; \
done
! if [ `(cd ./etc; /bin/pwd)` != `(cd ${docdir}; /bin/pwd)` ]; \
then \
echo "Copying etc/DOC* ..." ; \
! (cd etc; tar -cf - DOC*)|(cd ${docdir}; umask 0; tar -xvf - ); \
else true; fi
thisdir=`/bin/pwd`; \
! if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \
then \
(cd ${srcdir}/info ; \
! if [ ! -f ${infodir}/dir ] && [ -f dir ]; then \
! (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir); \
fi ; \
for f in cl* dired-x* emacs* forms* gnus* info* sc* vip* ; do \
! (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f); \
done); \
else true; fi
thisdir=`/bin/pwd`; cd ${srcdir}/etc; for page in emacs etags ctags ; do \
! (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 ${mandir}/$${page}${manext}); \
done
### Build all the directories we're going to install Emacs in. Since
--- 323,346 ----
rm -f $${subdir}/*~ ; \
done) ; \
done
! if [ `(cd ./etc; /bin/pwd)` != `(cd ${DESTDIR}${docdir}; /bin/pwd)` ]; \
then \
echo "Copying etc/DOC* ..." ; \
! (cd etc; tar -cf - DOC*)|(cd ${DESTDIR}${docdir}; umask 0; tar -xvf - ); \
else true; fi
thisdir=`/bin/pwd`; \
! if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${DESTDIR}${infodir} && /bin/pwd)` ]; \
then \
(cd ${srcdir}/info ; \
! if [ ! -f ${DESTDIR}${infodir}/dir ] && [ -f dir ]; then \
! (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/info/dir ${DESTDIR}${infodir}/dir); \
fi ; \
for f in cl* dired-x* emacs* forms* gnus* info* sc* vip* ; do \
! (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/info/$$f ${DESTDIR}${infodir}/$$f); \
done); \
else true; fi
thisdir=`/bin/pwd`; cd ${srcdir}/etc; for page in emacs etags ctags ; do \
! (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 ${DESTDIR}${mandir}/$${page}${manext}); \
done
### Build all the directories we're going to install Emacs in. Since
***************
*** 348,358 ****
### /usr/local/lib/emacs/19.0/mips-dec-ultrix4.2), we use make-path
### instead of mkdir. Not all systems' mkdirs have the `-p' flag.
mkdir: FRC.mkdir
! ./lib-src/make-path ${COPYDESTS} ${lockdir} ${infodir} ${mandir} \
! ${bindir} ${datadir} ${docdir} ${libdir} \
! `echo ${locallisppath} | sed 's/:/ /g'`
! -chmod 777 ${lockdir}
### Delete all the installed files that the `install' target would
### create (but not the noninstalled files such as `make all' would
### create).
--- 348,360 ----
### /usr/local/lib/emacs/19.0/mips-dec-ultrix4.2), we use make-path
### instead of mkdir. Not all systems' mkdirs have the `-p' flag.
mkdir: FRC.mkdir
! ./lib-src/make-path ${COPYDESTS} ${DESTDIR}${lockdir} ${DESTDIR}${infodir} ${DESTDIR}${mandir} \
! ${DESTDIR}${bindir} ${DESTDIR}${datadir} ${DESTDIR}${docdir} ${DESTDIR}${libdir} \
! `echo ${DESTDIR}${locallisppath} | sed 's/:/ /g'`
+ # Bad move at IS where lockdir is /usr/tmp
+ # -chmod 777 ${DESTDIR}${lockdir}
+
### Delete all the installed files that the `install' target would
### create (but not the noninstalled files such as `make all' would
### create).
***************
*** 360,369 ****
### Don't delete the lisp and etc directories if they're in the source tree.
uninstall:
(cd lib-src; \
! $(MAKE) $(MFLAGS) uninstall \
prefix=${prefix} exec_prefix=${exec_prefix} \
bindir=${bindir} libdir=${libdir} archlibdir=${archlibdir})
! for dir in ${lispdir} ${etcdir} ; do \
if [ -d $${dir} ]; then \
case `(cd $${dir} ; /bin/pwd)` in \
`(cd ${srcdir} ; /bin/pwd)`* ) ;; \
--- 362,371 ----
### Don't delete the lisp and etc directories if they're in the source tree.
uninstall:
(cd lib-src; \
! $(MAKE) $(MFLAGS) uninstall DESTDIR=${DESTDIR} \
prefix=${prefix} exec_prefix=${exec_prefix} \
bindir=${bindir} libdir=${libdir} archlibdir=${archlibdir})
! for dir in ${DESTDIR}${lispdir} ${DESTDIR}${etcdir} ; do \
if [ -d $${dir} ]; then \
case `(cd $${dir} ; /bin/pwd)` in \
`(cd ${srcdir} ; /bin/pwd)`* ) ;; \
***************
*** 370,377 ****
* ) rm -rf $${dir} ;; \
esac ; \
case $${dir} in \
! ${datadir}/emacs/${version}/* ) \
! rm -rf ${datadir}/emacs/${version} \
;; \
esac ; \
fi ; \
--- 372,379 ----
* ) rm -rf $${dir} ;; \
esac ; \
case $${dir} in \
! ${DESTDIR}${datadir}/emacs/${version}/* ) \
! rm -rf ${DESTDIR}${datadir}/emacs/${version} \
;; \
esac ; \
fi ; \
***************
*** 502,511 ****
(cd man; chmod u+w *texi* ChangeLog split-man)
(cd oldXMenu; chmod u+w *.[ch] Makefile README)
(cd lwlib; chmod u+w *.[ch] Makefile README)
! (cd src; $(MAKE) $(MFLAGS) relock)
TAGS tags: lib-src
! cd ${srcdir}/src; $(MAKE) tags
check:
@echo "We don't have any tests for GNU Emacs yet."
--- 504,513 ----
(cd man; chmod u+w *texi* ChangeLog split-man)
(cd oldXMenu; chmod u+w *.[ch] Makefile README)
(cd lwlib; chmod u+w *.[ch] Makefile README)
! (cd src; $(MAKE) $(MFLAGS) relock )
TAGS tags: lib-src
! cd ${srcdir}/src; $(MAKE) tags DESTDIR=${DESTDIR}
check:
@echo "We don't have any tests for GNU Emacs yet."
***************
*** 516,521 ****
.PHONY: info dvi dist check
force-info:
info: force-info
! (cd ${srcdir}/man; $(MAKE) $(MFLAGS) info)
dvi:
! (cd ${srcdir}/man; $(MAKE) $(MFLAGS) dvi)
--- 518,523 ----
.PHONY: info dvi dist check
force-info:
info: force-info
! (cd ${srcdir}/man; $(MAKE) $(MFLAGS) DESTDIR=${DESTDIR} info)
dvi:
! (cd ${srcdir}/man; $(MAKE) $(MFLAGS) DESTDIR=${DESTDIR} dvi)
*** 1.1 1995/03/11 14:45:35
--- lib-src/Makefile.in.in 1995/03/20 19:33:01
***************
*** 179,189 ****
maybe-blessmail: BLESSMAIL
#ifdef MOVEMAIL_NEEDS_BLESSING
/* Don't charge ahead and do it! Let the installer decide.
! ./blessmail ${archlibdir}/movemail */
@if [ `wc -l <blessmail` != 2 ] ; then \
dir=`sed -n -e 's/echo mail directory = \(.*\)/\1/p' blessmail`; \
echo Assuming $$dir is really the mail spool directory, you should; \
! echo run lib-src/blessmail ${archlibdir}/movemail; \
echo as root, to give movemail appropriate permissions.; \
echo Do that after running make install.; \
fi
--- 179,189 ----
maybe-blessmail: BLESSMAIL
#ifdef MOVEMAIL_NEEDS_BLESSING
/* Don't charge ahead and do it! Let the installer decide.
! ./blessmail ${DESTDIR}${archlibdir}/movemail */
@if [ `wc -l <blessmail` != 2 ] ; then \
dir=`sed -n -e 's/echo mail directory = \(.*\)/\1/p' blessmail`; \
echo Assuming $$dir is really the mail spool directory, you should; \
! echo run lib-src/blessmail ${DESTDIR}${archlibdir}/movemail; \
echo as root, to give movemail appropriate permissions.; \
echo Do that after running make install.; \
fi
***************
*** 191,228 ****
/* Install the internal utilities. Until they are installed, we can
just run them directly from lib-src. */
! ${archlibdir}: all
@echo
@echo "Installing utilities run internally by Emacs."
! ./make-path ${archlibdir}
! if [ `(cd ${archlibdir} && /bin/pwd)` != `/bin/pwd` ]; then \
for file in ${UTILITIES}; do \
! (cd ..; $(INSTALL_PROGRAM) lib-src/$$file ${archlibdir}/$$file) ; \
done ; \
fi
! if [ `(cd ${archlibdir} && /bin/pwd)` \
!= `(cd ${srcdir} && /bin/pwd)` ]; then \
for file in ${SCRIPTS}; do \
! (cd ..; $(INSTALL_PROGRAM) ${srcdir}/$$file ${archlibdir}/$$file); \
done ; \
fi
/* We don't need to install `wakeup' explicitly, because it will be
copied when this whole directory is copied. */
! install: ${archlibdir}
@echo
@echo "Installing utilities for users to run."
for file in ${INSTALLABLES} ; do \
! (cd ..; $(INSTALL_PROGRAM) lib-src/$${file} ${bindir}/$${file}) ; \
done
for file in ${INSTALLABLE_SCRIPTS} ; do \
! (cd ..; $(INSTALL_PROGRAM) ${srcdir}/$${file} ${bindir}/$${file}) ; \
done
uninstall:
! (cd ${bindir}; \
rm -f ${INSTALLABLES} ${INSTALLABLE_SCRIPTS})
! (cd ${archlibdir}; \
rm -f ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS})
mostlyclean:
--- 191,228 ----
/* Install the internal utilities. Until they are installed, we can
just run them directly from lib-src. */
! ${DESTDIR}${archlibdir}: all
@echo
@echo "Installing utilities run internally by Emacs."
! ./make-path ${DESTDIR}${archlibdir}
! if [ `(cd ${DESTDIR}${archlibdir} && /bin/pwd)` != `/bin/pwd` ]; then \
for file in ${UTILITIES}; do \
! (cd ..; $(INSTALL_PROGRAM) lib-src/$$file ${DESTDIR}${archlibdir}/$$file) ; \
done ; \
fi
! if [ `(cd ${DESTDIR}${archlibdir} && /bin/pwd)` \
!= `(cd ${srcdir} && /bin/pwd)` ]; then \
for file in ${SCRIPTS}; do \
! (cd ..; $(INSTALL_PROGRAM) ${srcdir}/$$file ${DESTDIR}${archlibdir}/$$file); \
done ; \
fi
/* We don't need to install `wakeup' explicitly, because it will be
copied when this whole directory is copied. */
! install: ${DESTDIR}${archlibdir}
@echo
@echo "Installing utilities for users to run."
for file in ${INSTALLABLES} ; do \
! (cd ..; $(INSTALL_PROGRAM) lib-src/$${file} ${DESTDIR}${bindir}/$${file}) ; \
done
for file in ${INSTALLABLE_SCRIPTS} ; do \
! (cd ..; $(INSTALL_PROGRAM) ${srcdir}/$${file} ${DESTDIR}${bindir}/$${file}) ; \
done
uninstall:
! (cd ${DESTDIR}${bindir}; \
rm -f ${INSTALLABLES} ${INSTALLABLE_SCRIPTS})
! (cd ${DESTDIR}${archlibdir}; \
rm -f ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS})
mostlyclean:
***************
*** 298,304 ****
$(CC) ${ALL_CFLAGS} ${srcdir}/b2m.c $(LOADLIBES) -o b2m
movemail: ${srcdir}/movemail.c ../src/config.h
! $(CC) ${ALL_CFLAGS} ${srcdir}/movemail.c $(LOADLIBES) -o movemail
cvtmail: ${srcdir}/cvtmail.c
$(CC) ${ALL_CFLAGS} ${srcdir}/cvtmail.c $(LOADLIBES) -o cvtmail
--- 298,304 ----
$(CC) ${ALL_CFLAGS} ${srcdir}/b2m.c $(LOADLIBES) -o b2m
movemail: ${srcdir}/movemail.c ../src/config.h
! $(CC) ${ALL_CFLAGS} -I/usr/athena/include -DHESIOD -DMAIL_USE_POP -DKERBEROS ${srcdir}/movemail.c -L/usr/athena/lib -lkrb -ldes -lhesiod $(LOADLIBES) -o movemail
cvtmail: ${srcdir}/cvtmail.c
$(CC) ${ALL_CFLAGS} ${srcdir}/cvtmail.c $(LOADLIBES) -o cvtmail
