Enable stage support

This commit is contained in:
Johan van Selst 2013-12-29 20:54:45 +00:00
parent a8ef9bf3b4
commit 0034b52c47
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=338044
3 changed files with 24 additions and 17 deletions

View file

@ -14,9 +14,6 @@ USE_BZIP2= yes
USE_LDCONFIG= yes
MAKE_JOBS_UNSAFE= yes
NO_STAGE= yes
MAN1= calc.1
CALCPAGER?= more
MAKE_ENV+= CALCPAGER="${CALCPAGER}" CAT="${CAT}" CHMOD="${CHMOD}" \

View file

@ -1,15 +1,15 @@
--- Makefile.orig 2008-05-10 07:58:05.000000000 -0400
+++ Makefile 2008-08-06 08:53:08.992116860 -0400
@@ -585,7 +585,7 @@
--- Makefile.orig 2013-09-27 10:55:28.000000000 +0200
+++ Makefile 2013-12-29 21:49:45.000000000 +0100
@@ -585,7 +585,7 @@ HAVE_UNUSED=
#INCDIR= /usr/local/include
#INCDIR= /dev/env/DJDIR/include
-INCDIR= /usr/include
+INCDIR= ${PREFIX}/include
# Where to install calc realted things
# Where to install calc related things
#
@@ -612,15 +612,15 @@
@@ -624,15 +624,15 @@ INCDIR= /usr/include
#
#BINDIR= /usr/local/bin
#BINDIR= /dev/env/DJDIR/bin
@ -28,7 +28,16 @@
# NOTE: Do not set CALC_INCDIR to /usr/include or /usr/local/include!!!
# Always be sure that the CALC_INCDIR path ends in /calc to avoid
@@ -698,7 +698,7 @@
@@ -699,7 +699,7 @@ SCRIPTDIR= ${BINDIR}/cscript
#
# If in doubt, use T=
#
-T=
+T=${DESTDIR}
# where man pages are installed
#
@@ -710,7 +710,7 @@ T=
#MANDIR=
#MANDIR= /usr/local/man/man1
#MANDIR= /usr/man/man1
@ -37,7 +46,7 @@
#MANDIR= /dev/env/DJDIR/man/man1
#MANDIR= /usr/man/u_man/man1
#MANDIR= /usr/contrib/man/man1
@@ -837,14 +837,14 @@
@@ -837,14 +837,14 @@ CALCRC= ${CALC_SHAREDIR}/startup:~/.calc
#
# If in doubt, set USE_READLINE, READLINE_LIB and READLINE_INCLUDE to nothing.
#
@ -58,7 +67,7 @@
#
#READLINE_LIB= -L/usr/gnu/lib -lreadline
#READLINE_EXTRAS= -lhistory -lncurses
@@ -857,7 +857,7 @@
@@ -869,7 +869,7 @@ READLINE_INCLUDE=
#CALCPAGER= more
#CALCPAGER= pg
#CALCPAGER= cat
@ -67,7 +76,7 @@
#CALCPAGER= less.exe -ci
# Debug/Optimize options for ${CC} and ${LCC}
@@ -966,8 +966,8 @@
@@ -978,8 +978,8 @@ CALC_ENV= CALCPATH=./cal LD_LIBRARY_PATH
# MKDIR_ARG= -p # use mkdir -p when creating paths
# MKDIR_ARG= # use if system does not understand mkdir -p
#
@ -77,8 +86,8 @@
+MKDIR_ARG=
# Some out of date operating systems require/want an executable to
# end with a certain file extension. Some compile systems such as
@@ -999,35 +999,36 @@
# end with a certain file extension. Some compiler systems such as
@@ -1012,35 +1012,36 @@ LIB_EXT_VE= ${LIB_EXT}.${VE}
# standard utilities used during make
#
@ -128,7 +137,7 @@
# assume the X11 makedepend tool for the depend rule
MAKEDEPEND= makedepend
STRIP= strip
@@ -1235,13 +1236,15 @@
@@ -1248,13 +1249,15 @@ LIBCUSTCALC_STATIC=
#
CCWARN= -Wall -W -Wno-comment
CCWERR=
@ -148,7 +157,7 @@
#
endif
@@ -1469,7 +1472,8 @@
@@ -1516,7 +1519,8 @@ ICFLAGS= ${COMMON_CFLAGS} ${CC_STATIC}
else
ICFLAGS= ${COMMON_CFLAGS} ${CC_SHARE}
endif

View file

@ -75,6 +75,7 @@ lib/libcustcalc.so.%%VERSION%%
lib/libcustcalc.so.%%VER1%%
lib/libcustcalc.so.%%VER2%%
lib/libcustcalc.so.%%VER3%%
man/man1/calc.1.gz
%%DATADIR%%/README
%%DATADIR%%/alg_config.cal
%%DATADIR%%/beer.cal