Annotation of pkgsrc/math/capc-calc/patches/patch-aa, Revision 1.6
1.6 ! drochner 1: $NetBSD$
1.1 wiz 2:
1.6 ! drochner 3: --- Makefile.orig 2006-05-19 16:00:01.000000000 +0200
! 4: +++ Makefile
! 5: @@ -571,7 +571,7 @@ HAVE_UNUSED=
1.3 wiz 6:
7: #INCDIR= /usr/local/include
8: #INCDIR= /dev/env/DJDIR/include
9: -INCDIR= /usr/include
1.1 wiz 10: +INCDIR= ${PREFIX}/include
1.3 wiz 11:
12: # Where to install calc realted things
1.1 wiz 13: #
1.6 ! drochner 14: @@ -598,15 +598,15 @@ INCDIR= /usr/include
1.1 wiz 15: #
1.3 wiz 16: #BINDIR= /usr/local/bin
17: #BINDIR= /dev/env/DJDIR/bin
18: -BINDIR= /usr/bin
19: +BINDIR= ${PREFIX}/bin
20:
21: #LIBDIR= /usr/local/lib
22: #LIBDIR= /dev/env/DJDIR/lib
23: -LIBDIR= /usr/lib
24: +LIBDIR= ${PREFIX}/lib
25:
26: #CALC_SHAREDIR= /usr/local/lib/calc
27: #CALC_SHAREDIR= /dev/env/DJDIR/share/calc
28: -CALC_SHAREDIR= /usr/share/calc
29: +CALC_SHAREDIR= ${PREFIX}/share/calc
30:
31: #CALC_INCDIR= /usr/local/include/calc
32: #CALC_INCDIR= /dev/env/DJDIR/include/calc
1.6 ! drochner 33: @@ -680,7 +680,7 @@ T=
1.3 wiz 34: #MANDIR=
1.1 wiz 35: #MANDIR= /usr/local/man/man1
36: #MANDIR= /usr/man/man1
1.3 wiz 37: -MANDIR= /usr/share/man/man1
38: +MANDIR= ${PREFIX}/man/man1
39: #MANDIR= /dev/env/DJDIR/man/man1
40: #MANDIR= /usr/man/u_man/man1
41: #MANDIR= /usr/contrib/man/man1
1.6 ! drochner 42: @@ -691,7 +691,7 @@ MANDIR= /usr/share/man/man1
1.1 wiz 43: #
44: # Use CATDIR= to disable installation of the calc cat (formatted) page.
45: #
46: -CATDIR=
47: +CATDIR= ${PREFIX}/man/cat1
48: #CATDIR= /usr/local/man/cat1
49: #CATDIR= /usr/local/catman/cat1
50: #CATDIR= /usr/man/cat1
1.6 ! drochner 51: @@ -712,9 +712,9 @@ MANEXT= 1
1.1 wiz 52: #
53: # This is ignored if CATDIR is empty.
54: #
55: -CATEXT= 1
1.3 wiz 56: +#CATEXT= 1
57: #CATEXT= 1.gz
1.1 wiz 58: -#CATEXT= 0
59: +CATEXT= 0
60: #CATEXT= l
61:
62: # how to format a man page
1.6 ! drochner 63: @@ -740,8 +740,8 @@ CATEXT= 1
1.3 wiz 64: # and CATDIR to empty and ignore the NROFF, NROFF_ARG and MANMAKE
65: # lines below.
66: #
67: -#NROFF= nroff
68: -NROFF=
69: +NROFF= nroff
70: +#NROFF=
71: #NROFF= groff
72: NROFF_ARG= -man
73: #NROFF_ARG= -mandoc
1.6 ! drochner 74: @@ -785,10 +785,10 @@ CALCRC= ${CALC_SHAREDIR}/startup:~/.calc
1.1 wiz 75: #
76: # If in doubt, set USE_READLINE, READLINE_LIB and READLINE_INCLUDE to nothing.
77: #
78: -USE_READLINE=
79: -#USE_READLINE= -DUSE_READLINE
80: +#USE_READLINE=
81: +USE_READLINE= -DUSE_READLINE
82: #
83: -READLINE_LIB=
1.5 jschauma 84: +READLINE_LIB= -lreadline -lncurses
1.3 wiz 85: #READLINE_LIB= -lreadline -lhistory -lncurses
86: #READLINE_LIB= -L/usr/gnu/lib -lreadline -lhistory -lncurses
87: #READLINE_LIB= -L/usr/local/lib -lreadline -lhistory -lncurses
1.6 ! drochner 88: @@ -834,7 +834,7 @@ CALCPAGER= less
1.1 wiz 89: #
1.4 wiz 90: #DEBUG= -O3
91: #DEBUG= -O3 -g
92: -DEBUG= -O3 -g3
93: +#DEBUG= -O3 -g3
94: #DEBUG= -O3 -ipa
95: #DEBUG= -O3 -g3 -ipa
96: #
1.6 ! drochner 97: @@ -1007,10 +1007,10 @@ CCWERR=
1.2 jlam 98: CCOPT= ${DEBUG} ${NO_SHARED}
99: CCMISC=
100: #
1.3 wiz 101: -CFLAGS= -DCALC_SRC ${CCWARN} ${CCOPT} ${CCMISC}
102: -ICFLAGS= -DCALC_SRC ${CCWARN} ${CCMISC}
103: +CFLAGS= -DCALC_SRC ${CCWARN} ${CCOPT} ${CCMISC} ${CPPFLAGS}
104: +ICFLAGS= -DCALC_SRC ${CCWARN} ${CCMISC} ${CPPFLAGS}
1.2 jlam 105: #
106: -LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED}
107: +LDFLAGS+= ${NO_SHARED} ${LD_NO_SHARED}
108: ILDFLAGS=
109: #
110: LCC= gcc
CVSweb <webmaster@jp.NetBSD.org>