%n emacs %v 19.34b %c * %l * %b * %d * %f * %t emacs-19.34b.tgz %w Gnu %% %setup patch -u -p1 <<'ENDPATCH' diff -ru2N emacs-19.34b/Makefile.in emacs-MCC/Makefile.in --- emacs-19.34b/Makefile.in Tue Aug 20 05:12:19 1996 +++ emacs-MCC/Makefile.in Tue Sep 17 19:41:57 1996 @@ -309,5 +309,5 @@ libexecdir=${libexecdir} archlibdir=${archlibdir}) ${INSTALL_PROGRAM} src/emacs ${bindir}/emacs-${version} - -chmod 1755 ${bindir}/emacs-${version} + -chmod 1555 ${bindir}/emacs-${version} rm -f ${bindir}/$(EMACS) -ln ${bindir}/emacs-${version} ${bindir}/$(EMACS) @@ -336,5 +336,5 @@ && [ `(cd $${dir} && /bin/pwd)` != `(cd $${dest} && /bin/pwd)` ] \ && (echo "Copying $${dir} to $${dest}..." ; \ - (cd $${dir}; tar -cf - . )|(cd $${dest};umask 022; tar -xvf - ); \ + (cd $${dir}; tar -cf - . )|(cd $${dest};umask 022; tar -xivf - ); \ for subdir in `find $${dest} -type d ! -name RCS -print` ; do \ rm -rf $${subdir}/RCS ; \ @@ -355,5 +355,5 @@ then \ echo "Copying etc/DOC-* to ${docdir} ..." ; \ - (cd ./etc; tar -cf - DOC*)|(cd ${docdir}; umask 0; tar -xvf - ); \ + (cd ./etc; tar -cf - DOC*)|(cd ${docdir}; umask 0; tar -xivf - ); \ (cd $(docdir); chmod a+r DOC*; rm DOC) \ else true; fi @@ -363,22 +363,5 @@ then \ echo "Copying lisp/*.el and lisp/*.elc to ${lispdir} ..." ; \ - (cd lisp; tar -cf - *.el *.elc)|(cd ${lispdir}; umask 0; tar -xvf - ); \ - else true; fi - thisdir=`/bin/pwd`; \ - if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \ - then \ - (cd ${infodir}; \ - if [ -f dir ]; then \ - if [ ! -f dir.old ]; then mv -f dir dir.old; \ - else mv -f dir dir.bak; fi; \ - fi; \ - cd ${srcdir}/info ; \ - (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir); \ - (cd $${thisdir}; chmod a+r ${infodir}/dir); \ - for f in ccmode* cl* dired-x* ediff* emacs* forms* gnus* info* message* mh-e* sc* vip*; do \ - (cd $${thisdir}; \ - ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f; \ - chmod a+r ${infodir}/$$f); \ - done); \ + (cd lisp; tar -cf - *.el *.elc)|(cd ${lispdir}; umask 0; tar -xivf - ); \ else true; fi thisdir=`/bin/pwd`; \ @@ -388,4 +371,5 @@ ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 ${man1dir}/$${page}${manext}; \ chmod a+r ${man1dir}/$${page}${manext}); \ + gzip -9f ${man1dir}/$${page}${manext}; \ done diff -ru2N emacs-19.34b/install.sh emacs-MCC/install.sh --- emacs-19.34b/install.sh Tue Aug 13 02:10:24 1996 +++ emacs-MCC/install.sh Tue Sep 17 19:30:37 1996 @@ -45,5 +45,5 @@ transform_arg="" instcmd="$mvprog" -chmodcmd="$chmodprog 0755" +chmodcmd="$chmodprog 0555" chowncmd="" chgrpcmd="" diff -ru2N emacs-19.34b/lib-src/Makefile.in emacs-MCC/lib-src/Makefile.in --- emacs-19.34b/lib-src/Makefile.in Fri Jun 21 06:45:18 1996 +++ emacs-MCC/lib-src/Makefile.in Tue Sep 17 19:17:55 1996 @@ -90,5 +90,5 @@ # which should be installed in bindir. INSTALLABLES = etags ctags emacsclient b2m -INSTALLABLE_SCRIPTS = rcs-checkin +INSTALLABLE_SCRIPTS = # Things that Emacs runs internally, or during the build process, @@ -309,5 +309,5 @@ ./test-distrib ${srcdir}/testfile -GETOPTOBJS = getopt.o getopt1.o $(ALLOCA) +GETOPTOBJS = $(ALLOCA) GETOPTDEPS = $(GETOPTOBJS) ${srcdir}/getopt.h getopt.o: ${srcdir}/getopt.c ${srcdir}/getopt.h diff -ru2N emacs-19.34b/lisp/paths.el emacs-MCC/lisp/paths.el --- emacs-19.34b/lisp/paths.el Wed Jun 19 23:14:04 1996 +++ emacs-MCC/lisp/paths.el Tue Sep 17 19:26:58 1996 @@ -34,5 +34,5 @@ (defvar Info-default-directory-list - (let ((start (list "/usr/local/lib/info/" + (let ((start (list "/usr/local/share/info/" "/usr/opt/info" "/usr/share/info" ;; This comes second so that, if it is the same ;; as configure-info-directory (which is usually true) @@ -41,5 +41,5 @@ ;; which means that the last dir file Info-insert-dir ;; finds will be the one in this directory. - "/usr/local/info/")) + "/usr/share/info/")) (configdir (file-name-as-directory configure-info-directory))) (setq start (nconc start (list configdir))) @@ -56,7 +56,7 @@ (defvar news-path - (if (file-exists-p "/usr/spool/news/") - "/usr/spool/news/" - "/var/spool/news/") + (if (file-exists-p "/var/spool/news/") + "/var/spool/news/" + "/usr/spool/news/") "The root directory below which all news files are stored.") diff -ru2N emacs-19.34b/mkinstalldirs emacs-MCC/mkinstalldirs --- emacs-19.34b/mkinstalldirs Tue Aug 13 02:10:22 1996 +++ emacs-MCC/mkinstalldirs Tue Sep 17 19:20:48 1996 @@ -23,5 +23,5 @@ if test ! -d "$pathcomp"; then - echo "mkdir $pathcomp" 1>&2 + echo "install -d -m 555 $pathcomp" 1>&2 mkdir "$pathcomp" || lasterr=$? diff -ru2N emacs-19.34b/src/s/gnu-linux.h emacs-MCC/src/s/gnu-linux.h --- emacs-19.34b/src/s/gnu-linux.h Tue Jul 16 03:17:05 1996 +++ emacs-MCC/src/s/gnu-linux.h Tue Sep 17 20:52:45 1996 @@ -95,5 +95,5 @@ have heard of flock. Change this if you need to. */ -#define MAIL_USE_FLOCK +#undef MAIL_USE_FLOCK /* Define CLASH_DETECTION if you want lock files to be written @@ -287,5 +287,5 @@ and that can make trouble in etags.c because it gets the regex.h from Emacs and the function definitions in libc. So turn this off. */ -/* #define REGEXP_IN_LIBC */ +#define REGEXP_IN_LIBC /* Use BSD process groups, but use setpgid() instead of setpgrp() to ENDPATCH env INSTALL_PROGRAM='install -s -m 555' INSTALL_DATA='install -m 444' \ LDFLAGS='-s' CFLAGS='-O6 -fomit-frame-pointer' \ ./configure --prefix=/usr --with-x --with-x-toolkit=yes \ --infodir=/usr/share/info --sharedstatedir=/var/state make * make install * for i in /usr/libexec/emacs /usr/share/emacs;do find $i -follow|xargs chmod a+r-w;done * chmod 555 /var/state/emacs * chmod 1777 /var/state/emacs/lock %%