Date: Friday, October 15, 2010 @ 10:21:28 Author: rtoy Path: /project/cmucl/cvsroot/src/tools

Modified: make-main-dist.sh

Add DOCDIR variable so the location of the documentation files can be changed.

Patch supplied by Stelian Ionescu, from a patch for gentoo.

-------------------+ make-main-dist.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)

Index: src/tools/make-main-dist.sh diff -u src/tools/make-main-dist.sh:1.26 src/tools/make-main-dist.sh:1.27 --- src/tools/make-main-dist.sh:1.26 Wed Sep 8 08:06:23 2010 +++ src/tools/make-main-dist.sh Fri Oct 15 10:21:28 2010 @@ -29,6 +29,7 @@ fi

DESTDIR=${INSTALL_DIR:-release-$$} +DOCDIR=${DOCDIR:-doc/cmucl} MANDIR=${MANDIR:-man/man1} TARGET="`echo $1 | sed 's:/*$::'`" VERSION=$2 @@ -86,11 +87,11 @@ # set -x echo Installing main components install -d ${GROUP} ${OWNER} -m 0755 $DESTDIR/bin -install -d ${GROUP} ${OWNER} -m 0755 $DESTDIR/doc/cmucl install -d ${GROUP} ${OWNER} -m 0755 $DESTDIR/lib/cmucl install -d ${GROUP} ${OWNER} -m 0755 $DESTDIR/lib/cmucl/lib install -d ${GROUP} ${OWNER} -m 0755 $DESTDIR/lib/cmucl/lib/subsystems install -d ${GROUP} ${OWNER} -m 0755 $DESTDIR/lib/cmucl/lib/ext-formats +install -d ${GROUP} ${OWNER} -m 0755 $DESTDIR/${DOCDIR} install -d ${GROUP} ${OWNER} -m 0755 $DESTDIR/${MANDIR} install ${GROUP} ${OWNER} -m 0755 $TARGET/lisp/lisp $DESTDIR/bin/ if [ "$EXECUTABLE" = "true" ] @@ -150,11 +151,11 @@ $DESTDIR/${MANDIR}/ install ${GROUP} ${OWNER} -m 0644 src/general-info/lisp.1 \ $DESTDIR/${MANDIR}/ -install ${GROUP} ${OWNER} -m 0644 src/general-info/README $DESTDIR/doc/cmucl/ +install ${GROUP} ${OWNER} -m 0644 src/general-info/README $DESTDIR/${DOCDIR} if [ -f src/general-info/release-$VERSION.txt ] then install ${GROUP} ${OWNER} -m 0644 src/general-info/release-$VERSION.txt \ - $DESTDIR/doc/cmucl/ + $DESTDIR/${DOCDIR} fi

if [ -z "$INSTALL_DIR" ]; then