From b0b223400febdf9c44e2a473f5fecfdda83930a8 Mon Sep 17 00:00:00 2001
From: Raymond Toy <toy.raymond@gmail.com>
Date: Thu, 11 Jun 2015 21:20:32 -0700
Subject: [PATCH] Install the unix contribs in the main tarball instead of the
 extra.

---
 bin/make-extra-dist.sh | 2 +-
 bin/make-main-dist.sh  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/bin/make-extra-dist.sh b/bin/make-extra-dist.sh
index 8e49b2b7c..2e3e271f5 100755
--- a/bin/make-extra-dist.sh
+++ b/bin/make-extra-dist.sh
@@ -99,7 +99,7 @@ do
     install -d ${GROUP} ${OWNER} -m 0755 $DESTDIR/lib/cmucl/lib/$d
 done
 
-for f in `(cd src/contrib; find . -type f -print | egrep -v "CVS|asdf|defsystem")`
+for f in `(cd src/contrib; find . -type f -print | egrep -v "CVS|asdf|defsystem|unix")`
 do
     FILE=`basename $f`
     DIR=`dirname $f`
diff --git a/bin/make-main-dist.sh b/bin/make-main-dist.sh
index 4592d2b62..d938c36e7 100755
--- a/bin/make-main-dist.sh
+++ b/bin/make-main-dist.sh
@@ -140,6 +140,8 @@ esac
 
 install -d ${GROUP} ${OWNER} -m 0755 $DESTDIR/lib/cmucl/lib/contrib/unix
 install ${GROUP} ${OWNER} -m 0644 $TARGET/contrib/unix/$UCONTRIB.$FASL $DESTDIR/lib/cmucl/lib/contrib/unix
+install ${GROUP} ${OWNER} -m 0644 src/contrib/load-unix.lisp $DESTDIR/lib/cmucl/lib/contrib
+install ${GROUP} ${OWNER} -m 0644 src/contrib/unix/${UCONTRIB}.lisp $DESTDIR/lib/cmucl/lib/contrib/unix
 
 # Copy the source files for asdf and defsystem
 for f in `(cd src; find contrib/asdf contrib/defsystem -type f -print | grep -v CVS)`
-- 
GitLab