Ticket #46955: patch-Makefile.diff

File patch-Makefile.diff, 1.8 KB (added by rmerpes, 9 years ago)
  • Makefile

    old new  
    573573
    574574#INCDIR= /usr/local/include
    575575#INCDIR= /dev/env/DJDIR/include
    576 INCDIR= /usr/include
     576INCDIR= ___PREFIX___/include
    577577
    578578# Where to install calc related things
    579579#
     
    612612#
    613613#BINDIR= /usr/local/bin
    614614#BINDIR= /dev/env/DJDIR/bin
    615 BINDIR= /usr/bin
     615BINDIR= ___PREFIX___/bin
    616616
    617617#LIBDIR= /usr/local/lib
    618618#LIBDIR= /dev/env/DJDIR/lib
    619 LIBDIR= /usr/lib
     619LIBDIR= ___PREFIX___/lib
    620620
    621621#CALC_SHAREDIR= /usr/local/lib/calc
    622622#CALC_SHAREDIR= /dev/env/DJDIR/share/calc
    623 CALC_SHAREDIR= /usr/share/calc
     623CALC_SHAREDIR= ___PREFIX___/share/calc
    624624
    625625# NOTE: Do not set CALC_INCDIR to /usr/include or /usr/local/include!!!
    626626#       Always be sure that the CALC_INCDIR path ends in /calc to avoid
     
    687687#
    688688# If in doubt, use T=
    689689#
    690 T=
     690T=___DESTROOT___
    691691
    692692# where man pages are installed
    693693#
     
    698698#MANDIR=
    699699#MANDIR= /usr/local/man/man1
    700700#MANDIR= /usr/man/man1
    701 MANDIR= /usr/share/man/man1
     701MANDIR= ___PREFIX___/share/man/man1
    702702#MANDIR= /dev/env/DJDIR/man/man1
    703703#MANDIR= /usr/man/u_man/man1
    704704#MANDIR= /usr/contrib/man/man1
     
    825825#
    826826# If in doubt, set USE_READLINE, READLINE_LIB and READLINE_INCLUDE to nothing.
    827827#
    828 USE_READLINE=
    829 #USE_READLINE= -DUSE_READLINE
     828#USE_READLINE=
     829USE_READLINE= -DUSE_READLINE
    830830#
    831 READLINE_LIB=
    832 READLINE_EXTRAS=
     831#READLINE_LIB=
     832#READLINE_EXTRAS=
    833833#
    834834#READLINE_LIB= -lreadline
    835835#READLINE_EXTRAS= -lhistory -lncurses
     
    840840#READLINE_LIB= -L/usr/local/lib -lreadline
    841841#READLINE_EXTRAS= -lhistory -lncurses
    842842#
     843READLINE_LIB= -L___PREFIX___/lib -lreadline
     844READLINE_EXTRAS= -lhistory -lncurses
     845#
    843846# For Apple OS X: install fink from http://fink.sourceforge.net
    844847#                 and then do a 'fink install readline' and then use:
    845848#