diff options
| -rw-r--r-- | cad/felt/files/patch-aa | 60 | ||||
| -rw-r--r-- | science/felt/files/patch-aa | 60 |
2 files changed, 82 insertions, 38 deletions
diff --git a/cad/felt/files/patch-aa b/cad/felt/files/patch-aa index 73bdcbfccea7..dfc136434b61 100644 --- a/cad/felt/files/patch-aa +++ b/cad/felt/files/patch-aa @@ -1,19 +1,41 @@ -*** configure.orig Fri May 12 00:33:57 2000 ---- configure Fri May 12 00:39:34 2000 -*************** -*** 222,228 **** - CONTRIBFLAGS = $CONTRIBFLAGS - CPP = $CPP - DESTBIN = $DEST/bin -! DESTLIB = $DEST/lib/felt - DESTMAN = $DEST/man - INSTALL = sh \$(TOPDIR)/etc/install.sh -c - LDOPTS = ---- 222,228 ---- - CONTRIBFLAGS = $CONTRIBFLAGS - CPP = $CPP - DESTBIN = $DEST/bin -! DESTLIB = $DEST/share/felt - DESTMAN = $DEST/man - INSTALL = sh \$(TOPDIR)/etc/install.sh -c - LDOPTS = +--- configure.orig Mon May 29 23:29:15 1995 ++++ configure Mon Apr 30 03:03:43 2001 +@@ -71,7 +71,6 @@ + + echo Configuring ... + +-which CC gcc + which RANLIB ranlib + which CAT cat + which TRUE true +@@ -136,7 +135,6 @@ + + # provide worst-case defaults + +-: ${CC:=cc} + : ${RANLIB:=$TRUE} + : ${READDIR:=/lib} + : ${DEST}:=.} +@@ -145,12 +143,11 @@ + : ${X11INC:=.} + : ${X11LIB:=.} + +-CC=`basename $CC` + RANLIB=`basename $RANLIB` + READDIR=`dirname $READDIR` + CONTRIBDIR=none + +-if [ $CC = gcc ]; then CCOPTS=-O3; else CCOPTS=-O; fi ++CCOPTS=${CFLAGS} + + + # defaults for known architectures that fail the above +@@ -222,7 +219,7 @@ + CONTRIBFLAGS = $CONTRIBFLAGS + CPP = $CPP + DESTBIN = $DEST/bin +-DESTLIB = $DEST/lib/felt ++DESTLIB = $DEST/share/felt + DESTMAN = $DEST/man + INSTALL = sh \$(TOPDIR)/etc/install.sh -c + LDOPTS = diff --git a/science/felt/files/patch-aa b/science/felt/files/patch-aa index 73bdcbfccea7..dfc136434b61 100644 --- a/science/felt/files/patch-aa +++ b/science/felt/files/patch-aa @@ -1,19 +1,41 @@ -*** configure.orig Fri May 12 00:33:57 2000 ---- configure Fri May 12 00:39:34 2000 -*************** -*** 222,228 **** - CONTRIBFLAGS = $CONTRIBFLAGS - CPP = $CPP - DESTBIN = $DEST/bin -! DESTLIB = $DEST/lib/felt - DESTMAN = $DEST/man - INSTALL = sh \$(TOPDIR)/etc/install.sh -c - LDOPTS = ---- 222,228 ---- - CONTRIBFLAGS = $CONTRIBFLAGS - CPP = $CPP - DESTBIN = $DEST/bin -! DESTLIB = $DEST/share/felt - DESTMAN = $DEST/man - INSTALL = sh \$(TOPDIR)/etc/install.sh -c - LDOPTS = +--- configure.orig Mon May 29 23:29:15 1995 ++++ configure Mon Apr 30 03:03:43 2001 +@@ -71,7 +71,6 @@ + + echo Configuring ... + +-which CC gcc + which RANLIB ranlib + which CAT cat + which TRUE true +@@ -136,7 +135,6 @@ + + # provide worst-case defaults + +-: ${CC:=cc} + : ${RANLIB:=$TRUE} + : ${READDIR:=/lib} + : ${DEST}:=.} +@@ -145,12 +143,11 @@ + : ${X11INC:=.} + : ${X11LIB:=.} + +-CC=`basename $CC` + RANLIB=`basename $RANLIB` + READDIR=`dirname $READDIR` + CONTRIBDIR=none + +-if [ $CC = gcc ]; then CCOPTS=-O3; else CCOPTS=-O; fi ++CCOPTS=${CFLAGS} + + + # defaults for known architectures that fail the above +@@ -222,7 +219,7 @@ + CONTRIBFLAGS = $CONTRIBFLAGS + CPP = $CPP + DESTBIN = $DEST/bin +-DESTLIB = $DEST/lib/felt ++DESTLIB = $DEST/share/felt + DESTMAN = $DEST/man + INSTALL = sh \$(TOPDIR)/etc/install.sh -c + LDOPTS = |