*** Makefile.orig	Sun Sep  2 09:04:41 2007
--- Makefile	Sun Sep  2 09:06:55 2007
***************
*** 610,620 ****
  #	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
--- 610,620 ----
  #	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
***************
*** 626,632 ****
  #	conflicts with system or other application include files!!!
  #
! #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
--- 626,632 ----
  #	conflicts with system or other application include files!!!
  #
! 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
***************
*** 698,702 ****
  #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
--- 698,702 ----
  #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