summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile197
1 files changed, 95 insertions, 102 deletions
diff --git a/Makefile b/Makefile
index c8784fd..1da2d5f 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ intro:
@echo
-make slib.info
-VERSION = 3a5
+VERSION = 3b1
RELEASE = 1
rpm_prefix=$(HOME)/rpmbuild/
@@ -22,8 +22,7 @@ bindir = $(exec_prefix)bin/
libdir = $(exec_prefix)lib/
libslibdir = $(libdir)slib/
# directory where `make install' will put manual page.
-mandir = $(prefix)man/
-man1dir = $(mandir)man1/
+man1dir = $(prefix)man/man1/
infodir = $(prefix)info/
PREVDOCS = prevdocs/
@@ -38,8 +37,8 @@ VM = scheme48vm
IMAGE48 = slib.image
INSTALL_DATA = install -c
-$(S48LIB)slibcat:
- touch $(S48LIB)slibcat
+$(DESTDIR)$(S48LIB)slibcat:
+ touch $(DESTDIR)$(S48LIB)slibcat
catalogs:
-if type scm; then scm -c "(require 'new-catalog)"; fi
@@ -47,8 +46,10 @@ catalogs:
"(use-modules (ice-9 slib)) (require 'new-catalog)"; fi
-if type umb-scheme; then SCHEME_INIT=umbscheme.init;export SCHEME_INIT;\
echo "(require 'new-catalog)" | umb-scheme; fi
- -if type mzscheme; then SCHEME_LIBRARY_PATH=`pwd`/;export SCHEME_LIBRARY_PATH;\
- mzscheme -g -f DrScheme.init -e "(require 'new-catalog)" </dev/null; fi
+ -if type mzscheme; then\
+ SCHEME_LIBRARY_PATH=`pwd`/;export SCHEME_LIBRARY_PATH;\
+ cp mkpltcat.scm `mzscheme -mf mzscheme.init -e '(begin(display(implementation-vicinity))(exit))'`mkimpcat.scm;\
+ mzscheme -g -f mzscheme.init -e "(require 'new-catalog)" </dev/null; fi
-if type scheme48; then make install48; fi
MKNMDB = (require 'color-database) (make-slib-color-name-db) (slib:exit)
@@ -61,46 +62,46 @@ clrnamdb.scm: mkclrnam.scm color.scm resenecolours.txt saturate.txt nbs-iscc.tx
elif type umb-scheme; then SCHEME_INIT=`pwd`/umbscheme.init;export SCHEME_INIT;\
echo "$(MKNMDB)" | umb-scheme;\
elif type mzscheme; then SCHEME_LIBRARY_PATH=`pwd`/;export SCHEME_LIBRARY_PATH;\
- echo "$(MKNMDB)" | mzscheme -f DrScheme.init;\
+ echo "$(MKNMDB)" | mzscheme -f mzscheme.init;\
fi
-$(S48SLIB)strport.scm:
- test -d $(S48SLIB) || mkdir $(S48SLIB)
- echo ";;; strport.scm -*- scheme -*-">$(S48SLIB)strport.scm
- echo ";@">>$(S48SLIB)strport.scm
- echo "(define (call-with-output-string proc)">>$(S48SLIB)strport.scm
- echo " (let ((port (make-string-output-port)))">>$(S48SLIB)strport.scm
- echo " (proc port)">>$(S48SLIB)strport.scm
- echo " (string-output-port-output port)))">>$(S48SLIB)strport.scm
- echo "(define (call-with-input-string string proc)">>$(S48SLIB)strport.scm
- echo " (proc (make-string-input-port string)))">>$(S48SLIB)strport.scm
-
-$(S48SLIB)record.scm:
- test -d $(S48SLIB) || mkdir $(S48SLIB)
- echo ";;; record.scm -*- scheme -*-">$(S48SLIB)record.scm
- echo ";; This code is in the public domain">>$(S48SLIB)record.scm
- echo ";@">>$(S48SLIB)record.scm
- echo "(define make-record-type make-record-type)">>$(S48SLIB)record.scm
- echo "(define record-constructor">>$(S48SLIB)record.scm
- echo " (let ((constructor record-constructor))">>$(S48SLIB)record.scm
- echo " (lambda (rt . fields)">>$(S48SLIB)record.scm
- echo " (constructor rt (if (pair? fields)">>$(S48SLIB)record.scm
- echo " (car fields)">>$(S48SLIB)record.scm
- echo " (record-type-field-names rt))))))">>$(S48SLIB)record.scm
- echo "(define record-predicate record-predicate)">>$(S48SLIB)record.scm
- echo "(define record-accessor record-accessor)">>$(S48SLIB)record.scm
- echo "(define record-modifier record-modifier)">>$(S48SLIB)record.scm
+$(DESTDIR)$(S48SLIB)strport.scm:
+ mkdir -p $(DESTDIR)$(S48SLIB)
+ echo ";;; strport.scm -*- scheme -*-">$(DESTDIR)$(S48SLIB)strport.scm
+ echo ";@">>$(DESTDIR)$(S48SLIB)strport.scm
+ echo "(define (call-with-output-string proc)">>$(DESTDIR)$(S48SLIB)strport.scm
+ echo " (let ((port (make-string-output-port)))">>$(DESTDIR)$(S48SLIB)strport.scm
+ echo " (proc port)">>$(DESTDIR)$(S48SLIB)strport.scm
+ echo " (string-output-port-output port)))">>$(DESTDIR)$(S48SLIB)strport.scm
+ echo "(define (call-with-input-string string proc)">>$(DESTDIR)$(S48SLIB)strport.scm
+ echo " (proc (make-string-input-port string)))">>$(DESTDIR)$(S48SLIB)strport.scm
+
+$(DESTDIR)$(S48SLIB)record.scm:
+ mkdir -p $(DESTDIR)$(S48SLIB)
+ echo ";;; record.scm -*- scheme -*-">$(DESTDIR)$(S48SLIB)record.scm
+ echo ";; This code is in the public domain">>$(DESTDIR)$(S48SLIB)record.scm
+ echo ";@">>$(DESTDIR)$(S48SLIB)record.scm
+ echo "(define make-record-type make-record-type)">>$(DESTDIR)$(S48SLIB)record.scm
+ echo "(define record-constructor">>$(DESTDIR)$(S48SLIB)record.scm
+ echo " (let ((constructor record-constructor))">>$(DESTDIR)$(S48SLIB)record.scm
+ echo " (lambda (rt . fields)">>$(DESTDIR)$(S48SLIB)record.scm
+ echo " (constructor rt (if (pair? fields)">>$(DESTDIR)$(S48SLIB)record.scm
+ echo " (car fields)">>$(DESTDIR)$(S48SLIB)record.scm
+ echo " (record-type-field-names rt))))))">>$(DESTDIR)$(S48SLIB)record.scm
+ echo "(define record-predicate record-predicate)">>$(DESTDIR)$(S48SLIB)record.scm
+ echo "(define record-accessor record-accessor)">>$(DESTDIR)$(S48SLIB)record.scm
+ echo "(define record-modifier record-modifier)">>$(DESTDIR)$(S48SLIB)record.scm
slib48: $(IMAGE48)
$(IMAGE48): Makefile $(S48INIT)
S48_VERSION="`echo ,exit | $(RUNNABLE) | sed -n 's/Welcome to Scheme 48 //;s/ ([^)]*)[.]//;p;q'`";export S48_VERSION;\
- S48_VICINITY="$(S48LIB)";export S48_VICINITY;\
+ S48_VICINITY="$(DESTDIR)$(S48LIB)";export S48_VICINITY;\
SCHEME_LIBRARY_PATH="`pwd`/";export SCHEME_LIBRARY_PATH;\
$(RUNNABLE) < $(S48INIT)
-install48: $(IMAGE48) $(S48SLIB)strport.scm $(S48SLIB)record.scm
- $(INSTALL_DATA) $(IMAGE48) $(S48LIB)
+install48: $(IMAGE48) $(DESTDIR)$(S48SLIB)strport.scm $(DESTDIR)$(S48SLIB)record.scm
+ $(INSTALL_DATA) $(IMAGE48) $(DESTDIR)$(S48LIB)
(echo '#! /bin/sh';\
- echo exec $(RUNNABLE) -i '$(S48LIB)$(IMAGE48)' \"\$$\@\") \
+ echo exec $(RUNNABLE) -i '$(DESTDIR)$(S48LIB)$(IMAGE48)' \"\$$\@\") \
> $(DESTDIR)$(bindir)slib48
chmod +x $(DESTDIR)$(bindir)slib48
@@ -126,7 +127,7 @@ efiles = record.scm dynamic.scm process.scm hash.scm \
rfiles = rdms.scm alistab.scm paramlst.scm \
batch.scm crc.scm dbrowse.scm getopt.scm dbinterp.scm \
dbcom.scm dbsyn.scm
-gfiles = colorspc.scm cie1931.xyz cie1964.xyz resenecolours.txt saturate.txt \
+ciefiles = cie1931.xyz cie1964.xyz resenecolours.txt saturate.txt \
nbs-iscc.txt ciesid65.dat ciesia.dat
txiscms =grapheps.scm glob.scm getparam.scm \
@@ -157,31 +158,29 @@ texifiles = schmooz.texi indexes.texi object.texi format.texi limit.texi \
fdl.texi
docfiles = ANNOUNCE README COPYING FAQ slib.1 slib.info slib.texi version.txi\
ChangeLog $(texifiles) $(txifiles)
-mkfiles = Makefile require.scm Template.scm syncase.sh mklibcat.scm \
- Bev2slib.scm slib.spec slib.sh grapheps.ps slib.nsi
+mkfiles = Makefile require.scm Template.scm mklibcat.scm mkpltcat.scm \
+ syncase.sh Bev2slib.scm slib.spec slib.sh grapheps.ps slib.nsi
ifiles = bigloo.init chez.init elk.init macscheme.init mitscheme.init \
scheme2c.init scheme48.init gambit.init t3.init vscm.init \
scm.init scsh.init sisc.init pscheme.init STk.init kawa.init \
- RScheme.init DrScheme.init umbscheme.init guile.init jscheme.init
+ RScheme.init mzscheme.init umbscheme.init guile.init jscheme.init
tfiles = macrotst.scm dwindtst.scm formatst.scm
sfiles = $(ffiles) $(lfiles) $(revfiles) $(afiles) $(scfiles) $(efiles) \
- $(rfiles) $(gfiles) $(scafiles) $(txiscms) $(srfiles)
+ $(rfiles) colorspc.scm $(scafiles) $(txiscms) $(srfiles)
allfiles = $(docfiles) $(mkfiles) $(ifiles) $(sfiles) $(tfiles) $(bfiles) \
- slib.doc clrnamdb.scm
+ slib.doc $(ciefiles) clrnamdb.scm SLIB.ico
pinstall: slib.1
- test -d $(DESTDIR)$(mandir) || mkdir $(DESTDIR)$(mandir)
- test -d $(DESTDIR)$(man1dir) || mkdir $(DESTDIR)$(man1dir)
+ mkdir -p $(DESTDIR)$(man1dir)
-cp slib.1 $(DESTDIR)$(man1dir)
install: pinstall clrnamdb.scm
- test -d $(DESTDIR)$(libdir) || mkdir $(DESTDIR)$(libdir)
- test -d $(DESTDIR)$(libslibdir) || mkdir $(DESTDIR)$(libslibdir)
+ mkdir -p $(DESTDIR)$(libslibdir)
-cp $(ifiles) $(sfiles) $(bfiles) $(mkfiles) clrnamdb.scm $(DESTDIR)$(libslibdir)
- test -d $(DESTDIR)$(bindir) || mkdir $(DESTDIR)$(bindir)
+ mkdir -p $(DESTDIR)$(bindir)
echo '#! /bin/sh' > $(DESTDIR)$(bindir)slib
echo SCHEME_LIBRARY_PATH=$(DESTDIR)$(libslibdir) >> $(DESTDIR)$(bindir)slib
- echo S48_VICINITY=$(S48LIB) >> $(DESTDIR)$(bindir)slib
+ echo S48_VICINITY=$(DESTDIR)$(S48LIB) >> $(DESTDIR)$(bindir)slib
echo VERSION=$(VERSION) >> $(DESTDIR)$(bindir)slib
echo export SCHEME_LIBRARY_PATH S48_VICINITY >> $(DESTDIR)$(bindir)slib
cat slib.sh >> $(DESTDIR)$(bindir)slib
@@ -247,15 +246,15 @@ html: $(htmldir)slib_toc.html
# -rm -f slib_stoc.html
# if [ -f $(PREVDOCS)slib_toc.html ]; \
# then hitch $(PREVDOCS)slib_\*.html slib_\*.html $(htmldir); \
-# else cp slib_*.html $(htmldir);fi
+#p else cp slib_*.html $(htmldir);fi
-slib$(VERSION).info: version.txi slib.texi $(txifiles) $(texifiles)
+slib-$(VERSION).info: version.txi slib.texi $(txifiles) $(texifiles)
makeinfo slib.texi --no-warn --no-split -o slib.info
- mv slib.info slib$(VERSION).info
-slib.info: slib$(VERSION).info
+ mv slib.info slib-$(VERSION).info
+slib.info: slib-$(VERSION).info
if [ -f $(PREVDOCS)slib.info ];\
- then infobar $(PREVDOCS)slib.info slib$(VERSION).info slib.info;\
- else cp slib$(VERSION).info slib.info;fi
+ then infobar $(PREVDOCS)slib.info slib-$(VERSION).info slib.info;\
+ else cp slib-$(VERSION).info slib.info;fi
info: installinfo
installinfo: $(DESTDIR)$(infodir)slib.info
$(DESTDIR)$(infodir)slib.info: slib.info
@@ -274,7 +273,7 @@ docs: $(DESTDIR)$(infodir)slib.info.gz $(htmldir)slib_toc.html slib.dvi \
makedev = make -f $(HOME)/makefile.dev
CHPAT=$(HOME)/bin/chpat
-RSYNC=rsync --rsync-path=bin/rsync -bav
+RSYNC=rsync -bav
UPLOADEE=swissnet_upload
dest = $(HOME)/dist/
DOSCM = /c/Voluntocracy/dist/
@@ -297,6 +296,7 @@ $(PREVDOCS)slib.info: Makefile
cd $(PREVDOCS)slib; make slib.info; make slib_toc.html
cd $(PREVDOCS); mv -f slib/slib.info slib/*.html ./
rm -rf $(PREVDOCS)slib
+ -rm -f slib-$(VERSION).info
distinfo: $(dest)slib.info.zip
$(dest)slib.info.zip: infotemp/slib
@@ -304,34 +304,34 @@ $(dest)slib.info.zip: infotemp/slib
rm -rf infotemp
release: dist pdf tar.gz # rpm
- cvs tag -F slib$(VERSION)
+ cvs tag -F slib-$(VERSION)
cp ANNOUNCE $(htmldir)SLIB_ANNOUNCE.txt
cp COPYING $(htmldir)SLIB_COPYING.txt
cp FAQ $(htmldir)SLIB.FAQ
$(RSYNC) $(htmldir)SLIB.html $(htmldir)SLIB_ANNOUNCE.txt \
$(htmldir)SLIB_COPYING.txt $(UPLOADEE):public_html/
- $(RSYNC) $(dest)README $(dest)slib$(VERSION).zip \
- $(dest)slib$(VERSION).tar.gz \
+ $(RSYNC) $(dest)README $(dest)slib-$(VERSION).zip \
+ $(dest)slib-$(VERSION).tar.gz \
$(dest)slib-$(VERSION)-$(RELEASE).noarch.rpm \
$(dest)slib-$(VERSION)-$(RELEASE).src.rpm $(UPLOADEE):dist/
-# upload $(dest)README $(dest)slib$(VERSION).zip ftp.gnu.org:gnu/jacal/
+# upload $(dest)README $(dest)slib-$(VERSION).zip ftp.gnu.org:gnu/jacal/
upzip: $(HOME)/pub/slib.zip
$(RSYNC) $(HOME)/pub/slib.zip $(UPLOADEE):pub/
-dist: $(dest)slib$(VERSION).zip
-$(dest)slib$(VERSION).zip: temp/slib
- $(makedev) DEST=$(dest) PROD=slib ver=$(VERSION) zip
+dist: $(dest)slib-$(VERSION).zip
+$(dest)slib-$(VERSION).zip: temp/slib
+ $(makedev) DEST=$(dest) PROD=slib ver=-$(VERSION) zip
-tar.gz: $(dest)slib$(VERSION).tar.gz
-$(dest)slib$(VERSION).tar.gz: temp/slib
- $(makedev) DEST=$(dest) PROD=slib ver=$(VERSION) tar.gz
+tar.gz: $(dest)slib-$(VERSION).tar.gz
+$(dest)slib-$(VERSION).tar.gz: temp/slib
+ $(makedev) DEST=$(dest) PROD=slib ver=-$(VERSION) tar.gz
rpm: pubzip
-#$(dest)slib-$(VERSION)-$(RELEASE).noarch.rpm: $(dest)slib$(VERSION).zip
- cp $(HOME)/pub/slib.zip $(rpm_prefix)SOURCES/slib$(VERSION).zip
+#$(dest)slib-$(VERSION)-$(RELEASE).noarch.rpm: $(dest)slib-$(VERSION).zip
+ cp $(HOME)/pub/slib.zip $(rpm_prefix)SOURCES/slib-$(VERSION).zip
rpmbuild -ba slib.spec # --clean
- rm $(rpm_prefix)SOURCES/slib$(VERSION).zip
+ rm $(rpm_prefix)SOURCES/slib-$(VERSION).zip
mv $(rpm_prefix)RPMS/noarch/slib-$(VERSION)-$(RELEASE).noarch.rpm \
$(rpm_prefix)SRPMS/slib-$(VERSION)-$(RELEASE).src.rpm $(dest)
@@ -345,11 +345,11 @@ slib.com: temp/slib
zip: slib.zip
slib.zip: temp/slib
$(makedev) DEST=../ PROD=slib zip
-doszip: $(DOSCM)slib$(VERSION).zip
-$(DOSCM)slib$(VERSION).zip: temp/slib slib.html
- $(makedev) DEST=$(DOSCM) PROD=slib ver=$(VERSION) zip
- -cd ..; zip -9ur $(DOSCM)slib$(VERSION).zip slib/slib.html
- zip -d $(DOSCM)slib$(VERSION).zip slib/slib.info
+doszip: $(DOSCM)slib-$(VERSION).zip
+$(DOSCM)slib-$(VERSION).zip: temp/slib slib.html
+ $(makedev) DEST=$(DOSCM) PROD=slib ver=-$(VERSION) zip
+ -cd ..; zip -9ur $(DOSCM)slib-$(VERSION).zip slib/slib.html
+ zip -d $(DOSCM)slib-$(VERSION).zip slib/slib.info
pubzip: temp/slib
$(makedev) DEST=$(HOME)/pub/ PROD=slib zip
@@ -359,7 +359,7 @@ pubdiffs: temp/slib
distdiffs: temp/slib
$(makedev) DEST=$(dest) PROD=slib ver=$(ver) distdiffs
announcediffs: temp/slib
- $(makedev) DEST=$(dest) PROD=slib ver=$(VERSION) announcediffs
+ $(makedev) DEST=$(dest) PROD=slib ver=-$(VERSION) announcediffs
psdfiles=COPYING.psd README.psd cmuscheme.el comint.el instrum.scm pexpr.scm \
primitives.scm psd-slib.scm psd.el read.scm runtime.scm version.scm
@@ -369,52 +369,45 @@ psdtemp/slib:
-rm -rf psdtemp
mkdir -p psdtemp/slib/psd
cd psd; ln $(psdfiles) ../psdtemp/slib/psd
- mkdir psdtemp/slib/psd/doc
+ mkdir -p psdtemp/slib/psd/doc
cd psd/doc; ln $(psdocfiles) ../../psdtemp/slib/psd/doc
psdist: $(dest)slib-psd.tar.gz
$(dest)slib-psd.tar.gz: psdtemp/slib
$(makedev) DEST=$(dest) PROD=slib ver=-psd tar.gz TEMP=psdtemp/
+CITERS = FAQ README ANNOUNCE \
+ ../dist/README \
+ ../jacal/ANNOUNCE ../jacal/jacal.texi \
+ ../scm/ANNOUNCE ../scm/scm.texi \
+ ../wb/ANNOUNCE ../wb/README \
+ ../synch/ANNOUNCE \
+ $(DOSCM)unzipall.bat $(DOSCM)buildall \
+ $(htmldir)JACAL.html \
+ $(htmldir)README.html \
+ $(htmldir)SCM.html \
+ $(htmldir)SIMSYNCH.html \
+ $(htmldir)FreeSnell/ANNOUNCE $(htmldir)FreeSnell/index.html
+CITES = require.scm Makefile slib.spec scheme48.init \
+ $(htmldir)SLIB.html slib.nsi ../scm/scm.nsi
+
new:
+ $(CHPAT) slib-$(VERSION) slib-$(ver) $(CITERS)
+ $(CHPAT) $(VERSION) $(ver) $(CITES)
echo `date -I` \ Aubrey Jaffer \ \<`whoami`@`hostname`\>> change
echo>> change
echo \ \* require.scm \(*slib-version*\): Bumped from $(VERSION) to $(ver).>>change
echo>> change
cat ChangeLog >> change
mv -f change ChangeLog
- $(CHPAT) slib$(VERSION) slib$(ver) ANNOUNCE FAQ README \
- ../scm/ANNOUNCE \
- ../jacal/ANNOUNCE ../wb/README ../wb/ANNOUNCE \
- ../synch/ANNOUNCE \
- $(htmldir)README.html ../dist/README \
- $(htmldir)JACAL.html \
- $(htmldir)SCM.html \
- $(htmldir)SIMSYNCH.html ../scm/scm.texi ../jacal/jacal.texi \
- $(DOSCM)install.bat $(DOSCM)makefile \
- $(DOSCM)mkdisk.bat
- $(CHPAT) slib-$(VERSION) slib-$(ver) ANNOUNCE FAQ ../scm/ANNOUNCE \
- ../jacal/ANNOUNCE ../wb/README ../wb/ANNOUNCE \
- ../synch/ANNOUNCE \
- $(htmldir)README.html ../dist/README \
- $(htmldir)JACAL.html \
- $(htmldir)SCM.html \
- $(htmldir)SIMSYNCH.html ../scm/scm.texi ../jacal/jacal.texi \
- $(DOSCM)install.bat $(DOSCM)makefile \
- $(DOSCM)mkdisk.bat
- $(CHPAT) $(VERSION) $(ver) require.scm Makefile \
- $(htmldir)SLIB.html slib.spec scheme48.init \
- slib.nsi ../scm/scm.nsi
cvs commit -lm '(*slib-version*): Bumped from $(VERSION) to $(ver).'
- cvs tag -lF slib$(ver)
+ cvs tag -F slib-$(ver)
tagfiles = README version.txi slib.texi $(texifiles) \
$(mkfiles) $(sfiles) $(bfiles) $(tfiles) $(ifiles)
# README and $(ifiles) cause semgentation faults in ETAGS for Emacs version 19.
tags: $(tagfiles)
etags $(tagfiles)
-test: $(sfiles)
- $(scheme) Template.scm $(sfiles)
rights:
$(scheme) -ladmin -e"(admin:check-all)" $(sfiles) $(tfiles) \
$(bfiles) $(ifiles)