*** Makefile.dist	Thu Jul 29 00:18:56 2004
--- Makefile	Wed Sep  1 19:24:44 2004
***************
*** 598,616 ****
  #	CALC_SHAREDIR= /usr/share/calc
  #
! #BINDIR= /usr/local/bin
  #BINDIR= /dev/env/DJDIR/bin
! BINDIR= /usr/bin
  
! #LIBDIR= /usr/local/lib
  #LIBDIR= /dev/env/DJDIR/lib
! LIBDIR= /usr/lib
  
  #CALC_SHAREDIR= /usr/local/lib/calc
  #CALC_SHAREDIR= /dev/env/DJDIR/share/calc
! CALC_SHAREDIR= /usr/share/calc
  
! #CALC_INCDIR= /usr/local/include/calc
  #CALC_INCDIR= /dev/env/DJDIR/include/calc
! CALC_INCDIR= ${INCDIR}/calc
  
  # By default, these values are based CALC_SHAREDIR, INCDIR, BINDIR
--- 598,616 ----
  #	CALC_SHAREDIR= /usr/share/calc
  #
! BINDIR= /usr/local/bin
  #BINDIR= /dev/env/DJDIR/bin
! #BINDIR= /usr/bin
  
! LIBDIR= /usr/local/lib
  #LIBDIR= /dev/env/DJDIR/lib
! #LIBDIR= /usr/lib
  
  #CALC_SHAREDIR= /usr/local/lib/calc
  #CALC_SHAREDIR= /dev/env/DJDIR/share/calc
! CALC_SHAREDIR= /usr/local/share/calc
  
! CALC_INCDIR= /usr/local/include/calc
  #CALC_INCDIR= /dev/env/DJDIR/include/calc
! #CALC_INCDIR= ${INCDIR}/calc
  
  # By default, these values are based CALC_SHAREDIR, INCDIR, BINDIR
***************
*** 682,686 ****
  #MANDIR= /usr/local/man/man1
  #MANDIR= /usr/man/man1
! MANDIR= /usr/share/man/man1
  #MANDIR= /dev/env/DJDIR/man/man1
  #MANDIR= /usr/man/u_man/man1
--- 682,686 ----
  #MANDIR= /usr/local/man/man1
  #MANDIR= /usr/man/man1
! MANDIR= /usr/local/share/man/man1
  #MANDIR= /dev/env/DJDIR/man/man1
  #MANDIR= /usr/man/u_man/man1
***************
*** 693,697 ****
  # Use CATDIR= to disable installation of the calc cat (formatted) page.
  #
! CATDIR=
  #CATDIR= /usr/local/man/cat1
  #CATDIR= /usr/local/catman/cat1
--- 693,697 ----
  # Use CATDIR= to disable installation of the calc cat (formatted) page.
  #
! CATDIR= /usr/local/share/man/cat1
  #CATDIR= /usr/local/man/cat1
  #CATDIR= /usr/local/catman/cat1