diff options
| author | peter <peter@FreeBSD.org> | 1996-10-29 04:31:21 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1996-10-29 04:31:21 +0000 |
| commit | 9f7bf9578268bfeceaabace738d4a746d3852061 (patch) | |
| tree | 86335b1996b3794820fed1b923de9adb0402c1e8 /tools | |
| parent | cba992a99535ad6f35995fc4243c47e24bd19ce6 (diff) | |
| download | FreeBSD-src-9f7bf9578268bfeceaabace738d4a746d3852061.zip FreeBSD-src-9f7bf9578268bfeceaabace738d4a746d3852061.tar.gz | |
Along the way, the minor version number has been bumped (newer version
of tcl with new functions in the library), but the ports-compatable
link name wasn't bumped as it should have been.
Minor cleanups while here (including preserving the $Id: line)
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/tools/tcl_bmake/mkMakefile.sh | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/tools/tools/tcl_bmake/mkMakefile.sh b/tools/tools/tcl_bmake/mkMakefile.sh index 29c035d..32b0a0d 100644 --- a/tools/tools/tcl_bmake/mkMakefile.sh +++ b/tools/tools/tcl_bmake/mkMakefile.sh @@ -1,5 +1,5 @@ #! /bin/sh -# $Id: mkMakefile.sh,v 1.12 1996/09/20 14:12:17 bde Exp $ +# $Id: mkMakefile.sh,v 1.13 1996/10/27 12:44:44 wosch Exp $ # # This script generates a bmake Makefile for src/lib/libtcl # @@ -29,9 +29,14 @@ bar: ' >> m.x # Put a RCS Id in the file, but not the one from this file :-) -echo -n '# $' > ${LIBTCL}Makefile -echo -n 'Id' >> ${LIBTCL}Makefile -echo '$' >> ${LIBTCL}Makefile +if [ -f ${LIBTCL}Makefile ]; then + rcsid=`head -1 ${LIBTCL}Makefile` + echo "${rcsid}" > ${LIBTCL}Makefile +else + echo -n '# $' > ${LIBTCL}Makefile + echo -n 'Id' >> ${LIBTCL}Makefile + echo '$' >> ${LIBTCL}Makefile +fi # Tell 'em ! echo '# @@ -40,7 +45,7 @@ echo '# # Please change src/tools/tools/tcl_bmake/mkMakefile.sh instead # # Generated by src/tools/tools/tcl_bmake/mkMakefile.sh version: -# $Id: mkMakefile.sh,v 1.12 1996/09/20 14:12:17 bde Exp $ +# $Id: mkMakefile.sh,v 1.13 1996/10/27 12:44:44 wosch Exp $ # ' | tr -d '$' >> ${LIBTCL}Makefile @@ -72,7 +77,7 @@ LIB= tcl .if !defined(NOPIC) LINKS+= ${SHLIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ - ${SHLIBDIR}/lib${LIB}${SHLIB_MAJOR}.so.1.0 + ${SHLIBDIR}/lib${LIB}${SHLIB_MAJOR}.so.1.${SHLIB_MINOR} .endif LINKS+= ${LIBDIR}/lib${LIB}.a ${LIBDIR}/lib${LIB}${SHLIB_MAJOR}.a ' >> ${LIBTCL}Makefile @@ -195,11 +200,11 @@ _tclprev=${_tclpage} .endfor CLEANFILES+= ${_tcltmp} +.include <bsd.lib.mk> EOF -echo ' -.include <bsd.lib.mk>' >> ${LIBTCL}Makefile - -sed -e '/^TCL.*_LIB_SPEC=/s/-L.* //' < ${SRCDIR}/unix/tclConfig.sh > ${LIBTCL}/tclConfig.sh +sed < ${SRCDIR}/unix/tclConfig.sh > ${LIBTCL}/tclConfig.sh \ + -e '/^TCL.*_LIB_SPEC=/s/-L.* //' \ + -e "s/1\.0/1.${SHLIB_MINOR}/" rm -f m.x ${SRCDIR}/unix/config.log ${SRCDIR}/unix/Makefile ${SRCDIR}/unix/config.cache ${SRCDIR}/unix/config.status ${SRCDIR}/unix/tclConfig.sh |
