2007-02-07 16:29:30 +01:00
|
|
|
--- Makefile.orig Wed Feb 7 01:35:20 2007
|
|
|
|
+++ Makefile Wed Feb 7 14:54:34 2007
|
|
|
|
@@ -571,7 +571,7 @@
|
2001-07-08 04:11:49 +02:00
|
|
|
|
|
|
|
#INCDIR= /usr/local/include
|
2006-06-02 13:17:06 +02:00
|
|
|
#INCDIR= /dev/env/DJDIR/include
|
2001-07-08 04:11:49 +02:00
|
|
|
-INCDIR= /usr/include
|
|
|
|
+INCDIR= ${PREFIX}/include
|
|
|
|
|
2006-06-02 13:17:06 +02:00
|
|
|
# Where to install calc realted things
|
|
|
|
#
|
2007-02-07 16:29:30 +01:00
|
|
|
@@ -598,15 +598,15 @@
|
2006-06-02 13:17:06 +02:00
|
|
|
#
|
|
|
|
#BINDIR= /usr/local/bin
|
|
|
|
#BINDIR= /dev/env/DJDIR/bin
|
|
|
|
-BINDIR= /usr/bin
|
|
|
|
+BINDIR= ${PREFIX}/bin
|
|
|
|
|
2001-07-08 04:11:49 +02:00
|
|
|
#LIBDIR= /usr/local/lib
|
2006-06-02 13:17:06 +02:00
|
|
|
#LIBDIR= /dev/env/DJDIR/lib
|
2001-07-08 04:11:49 +02:00
|
|
|
-LIBDIR= /usr/lib
|
|
|
|
+LIBDIR= ${PREFIX}/lib
|
|
|
|
|
2006-06-02 13:17:06 +02:00
|
|
|
#CALC_SHAREDIR= /usr/local/lib/calc
|
|
|
|
#CALC_SHAREDIR= /dev/env/DJDIR/share/calc
|
|
|
|
-CALC_SHAREDIR= /usr/share/calc
|
|
|
|
+CALC_SHAREDIR= ${PREFIX}/share/calc
|
|
|
|
|
|
|
|
#CALC_INCDIR= /usr/local/include/calc
|
|
|
|
#CALC_INCDIR= /dev/env/DJDIR/include/calc
|
2007-02-07 16:29:30 +01:00
|
|
|
@@ -680,7 +680,7 @@
|
2001-07-08 04:11:49 +02:00
|
|
|
#MANDIR=
|
|
|
|
#MANDIR= /usr/local/man/man1
|
|
|
|
#MANDIR= /usr/man/man1
|
|
|
|
-MANDIR= /usr/share/man/man1
|
|
|
|
+MANDIR= ${PREFIX}/man/man1
|
2006-06-02 13:17:06 +02:00
|
|
|
#MANDIR= /dev/env/DJDIR/man/man1
|
2001-07-08 04:11:49 +02:00
|
|
|
#MANDIR= /usr/man/u_man/man1
|
|
|
|
#MANDIR= /usr/contrib/man/man1
|
2007-02-07 16:29:30 +01:00
|
|
|
@@ -785,13 +785,13 @@
|
2001-07-08 04:11:49 +02:00
|
|
|
#
|
|
|
|
# If in doubt, set USE_READLINE, READLINE_LIB and READLINE_INCLUDE to nothing.
|
|
|
|
#
|
|
|
|
-USE_READLINE=
|
|
|
|
-#USE_READLINE= -DUSE_READLINE
|
|
|
|
+#USE_READLINE=
|
|
|
|
+USE_READLINE= -DUSE_READLINE
|
|
|
|
#
|
2006-06-02 13:17:06 +02:00
|
|
|
-READLINE_LIB=
|
|
|
|
+#READLINE_LIB=
|
|
|
|
#READLINE_LIB= -lreadline -lhistory -lncurses
|
|
|
|
#READLINE_LIB= -L/usr/gnu/lib -lreadline -lhistory -lncurses
|
|
|
|
-#READLINE_LIB= -L/usr/local/lib -lreadline -lhistory -lncurses
|
|
|
|
+READLINE_LIB= -lreadline -lhistory -lncurses
|
2001-07-08 04:11:49 +02:00
|
|
|
#
|
2006-06-02 13:17:06 +02:00
|
|
|
# For Apple OS X: install fink from http://fink.sourceforge.net
|
|
|
|
# and then do a 'fink install readline' and then use:
|
2007-02-07 16:29:30 +01:00
|
|
|
@@ -1008,13 +1008,13 @@
|
1999-12-26 00:02:30 +01:00
|
|
|
CCOPT= ${DEBUG} ${NO_SHARED}
|
1999-12-26 21:24:22 +01:00
|
|
|
CCMISC=
|
1999-12-26 00:02:30 +01:00
|
|
|
#
|
2002-11-04 22:09:01 +01:00
|
|
|
-CFLAGS= -DCALC_SRC ${CCWARN} ${CCOPT} ${CCMISC}
|
|
|
|
-ICFLAGS= -DCALC_SRC ${CCWARN} ${CCMISC}
|
2007-02-07 16:29:30 +01:00
|
|
|
+CFLAGS+= -DCALC_SRC
|
|
|
|
+ICFLAGS= -DCALC_SRC
|
2000-02-06 07:32:33 +01:00
|
|
|
#
|
|
|
|
LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED}
|
|
|
|
ILDFLAGS=
|
|
|
|
#
|
2001-07-08 04:11:49 +02:00
|
|
|
-LCC= gcc
|
|
|
|
+LCC= cc
|
2007-02-07 16:29:30 +01:00
|
|
|
CC= ${PURIFY} ${LCC} ${CCWERR}
|
2000-02-06 07:32:33 +01:00
|
|
|
#
|
|
|
|
###
|
2007-02-07 16:29:30 +01:00
|
|
|
@@ -1573,6 +1573,7 @@
|
2006-06-02 13:17:06 +02:00
|
|
|
TARGETS= ${LICENSE} ${CALC_LIBS} custom/.all calc${EXT} sample/.all \
|
2007-02-07 16:29:30 +01:00
|
|
|
cal/.all help/.all help/builtin cscript/.all calc.1 calc.usage
|
2006-06-02 13:17:06 +02:00
|
|
|
|
|
|
|
+RM= rm
|
|
|
|
|
|
|
|
###
|
|
|
|
#
|