home *** CD-ROM | disk | FTP | other *** search
/ The UNIX CD Bookshelf / OREILLY_TUCB_UNIX_CD.iso / upt / examples / SOURCES / EMACS / RTR / EMACS. next >
Encoding:
Text File  |  1998-07-24  |  3.3 KB  |  85 lines
  1. --- ./Makefile.in.orig    Fri Mar 22 23:25:01 1996
  2. +++ ./Makefile.in    Sun Jul  7 14:38:53 1996
  3. @@ -99,6 +99,7 @@
  4.  # since there are now many packages documented with the texinfo
  5.  # system, it is inappropriate to imply that it is part of Emacs.
  6.  infodir=@infodir@
  7. +installinfodir=<installsharedir>/<prefix>lib/emacs/info
  8.  
  9.  # Where to look for bitmap files.
  10.  bitmapdir=@bitmapdir@
  11. @@ -364,20 +365,20 @@
  12.         (cd lisp; tar -cf - *.el *.elc)|(cd ${lispdir}; umask 0; tar -xvf - ); \
  13.      else true; fi
  14.      thisdir=`/bin/pwd`; \
  15. -    if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \
  16. +    if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${installinfodir} && /bin/pwd)` ]; \
  17.      then \
  18. -      (cd ${infodir};  \
  19. +      (cd ${installinfodir};  \
  20.         if [ -f dir ]; then \
  21.           if [ ! -f dir.old ]; then mv -f dir dir.old; \
  22.           else mv -f dir dir.bak; fi; \
  23.         fi; \
  24.         cd ${srcdir}/info ; \
  25. -       (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir); \
  26. -       (cd $${thisdir}; chmod a+r ${infodir}/dir); \
  27. +       (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/info/dir ${installinfodir}/dir); \
  28. +       (cd $${thisdir}; chmod a+r ${installinfodir}/dir); \
  29.         for f in ccmode* cl* dired-x* ediff* emacs* forms* gnus* info* mh-e* sc* vip*; do \
  30.           (cd $${thisdir}; \
  31. -          ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f; \
  32. -          chmod a+r ${infodir}/$$f); \
  33. +          ${INSTALL_DATA} ${srcdir}/info/$$f ${installinfodir}/$$f; \
  34. +          chmod a+r ${installinfodir}/$$f); \
  35.         done); \
  36.      else true; fi
  37.      thisdir=`/bin/pwd`; \
  38. @@ -397,7 +398,7 @@
  39.  ### /usr/local/lib/emacs/19.0/mips-dec-ultrix4.2), we use mkinstalldirs
  40.  ### instead of mkdir.  Not all systems' mkdir programs have the `-p' flag.
  41.  mkdir: FRC
  42. -    $(srcdir)/mkinstalldirs ${COPYDESTS} ${lockdir} ${infodir} ${man1dir} \
  43. +    $(srcdir)/mkinstalldirs ${COPYDESTS} ${lockdir} ${installinfodir} ${man1dir} \
  44.        ${bindir} ${datadir} ${docdir} ${libexecdir} \
  45.        `echo ${locallisppath} | sed 's/:/ /g'`
  46.      -chmod a+rwx ${lockdir}
  47. @@ -425,7 +426,7 @@
  48.          esac ;                    \
  49.        fi ;                        \
  50.      done
  51. -    (cd ${infodir} && rm -f cl* dired-x* ediff* emacs* forms* gnus* info* mh-e* sc* vip*)
  52. +    (cd ${installinfodir} && rm -f cl* dired-x* ediff* emacs* forms* gnus* info* mh-e* sc* vip*)
  53.      (cd ${man1dir}  && rm -f emacs.1 etags.1 ctags.1)
  54.      (cd ${bindir}  && rm -f emacs-${version} $(EMACS))
  55.  
  56. --- ./configure.orig    Sat May 25 11:59:44 1996
  57. +++ ./configure    Sun Jul  7 14:36:52 1996
  58. @@ -48,14 +48,14 @@
  59.  bindir='${exec_prefix}/bin'
  60.  sbindir='${exec_prefix}/sbin'
  61.  libexecdir='${exec_prefix}/libexec'
  62. -datadir='${prefix}/share'
  63. +datadir='${prefix}/slib'
  64.  sysconfdir='${prefix}/etc'
  65. -sharedstatedir='${prefix}/com'
  66. +sharedstatedir='${prefix}/slib'
  67.  localstatedir='${prefix}/var'
  68.  libdir='${exec_prefix}/lib'
  69.  includedir='${prefix}/include'
  70.  oldincludedir='/usr/include'
  71. -infodir='${prefix}/info'
  72. +infodir='/rtr.s/hack/to/fool/those/foolish/programs/that/insist/on/removing/slashes<installsharedir>/<prefix>lib/emacs/info'
  73.  mandir='${prefix}/man'
  74.  
  75.  # Initialize some other variables.
  76. @@ -532,7 +532,7 @@
  77.  lisppath='${locallisppath}:${lispdir}'
  78.  etcdir='${datadir}/emacs/${version}/etc'
  79.  lockdir='${sharedstatedir}/emacs/lock'
  80. -archlibdir='${libexecdir}/emacs/${version}/${configuration}'
  81. +archlibdir='${prefix}/lib/emacs/${version}/${configuration}'
  82.  docdir='${datadir}/emacs/${version}/etc'
  83.  
  84.  # Check whether --with-gcc or --without-gcc was given.
  85.