summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorThomas Bushnell, BSG <tb@debian.org>2007-12-28 16:25:32 -0800
committerBryan Newbold <bnewbold@robocracy.org>2017-02-20 00:05:39 -0800
commitd8ae23691ed6392b7f320f5fa7d4dd78ae52c10e (patch)
treeb20b8bc02e854c4c86d39ee22a0638a8b06e01af /Makefile
parentedd1ebef3ad774e7cbcc2f5918d555bfb0b44091 (diff)
parent64f037d91e0c9296dcaef9a0ff3eb33b19a2ed34 (diff)
downloadslib-d8ae23691ed6392b7f320f5fa7d4dd78ae52c10e.tar.gz
slib-d8ae23691ed6392b7f320f5fa7d4dd78ae52c10e.zip
Import Debian changes 3a5-1debian/3a5-1
slib (3a5-1) unstable; urgency=low * New upstream release. * slib.texi (Library Catalogs): Repeat change from 3a3-3. * Makefile: Repeat $(htmldir)slib_toc.html changes from 3a2-1. * guile.init: (library-vicinity): Repeat change from 3a4-2. * debian/rules (binary-indep): Don't hide .init files in a separate subdirectory, thus conforming better to the usual slib practice. Put a symlink in place to ease transitions. (Closes: #407370).
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile158
1 files changed, 73 insertions, 85 deletions
diff --git a/Makefile b/Makefile
index 166ac08..c8784fd 100644
--- a/Makefile
+++ b/Makefile
@@ -11,12 +11,7 @@ intro:
@echo
-make slib.info
-srcdir.mk: .. Makefile
- echo "srcdir = `pwd`/" > srcdir.mk
-#srcdir=$(HOME)/slib/
-include srcdir.mk
-
-VERSION = 3a4
+VERSION = 3a5
RELEASE = 1
rpm_prefix=$(HOME)/rpmbuild/
@@ -106,8 +101,8 @@ install48: $(IMAGE48) $(S48SLIB)strport.scm $(S48SLIB)record.scm
$(INSTALL_DATA) $(IMAGE48) $(S48LIB)
(echo '#! /bin/sh';\
echo exec $(RUNNABLE) -i '$(S48LIB)$(IMAGE48)' \"\$$\@\") \
- > $(bindir)slib48
- chmod +x $(bindir)slib48
+ > $(DESTDIR)$(bindir)slib48
+ chmod +x $(DESTDIR)$(bindir)slib48
ffiles = format.scm printf.scm genwrite.scm pp.scm \
ppfile.scm strcase.scm debug.scm trace.scm \
@@ -125,7 +120,7 @@ scfiles = r4rsyn.scm scmacro.scm synclo.scm synrul.scm synchk.scm \
repl.scm macwork.scm mwexpand.scm mwdenote.scm mwsynrul.scm
scafiles = scainit.scm scaglob.scm scamacr.scm scaoutp.scm scaexpp.scm \
structure.scm
-srfiles = srfi-2.scm srfi-8.scm srfi-9.scm srfi-23.scm srfi-61.scm
+srfiles = srfi-2.scm srfi-8.scm srfi-9.scm srfi-11.scm srfi-23.scm srfi-61.scm
efiles = record.scm dynamic.scm process.scm hash.scm \
wttree.scm wttest.scm sierpinski.scm soundex.scm simetrix.scm
rfiles = rdms.scm alistab.scm paramlst.scm \
@@ -137,7 +132,7 @@ gfiles = colorspc.scm cie1931.xyz cie1964.xyz resenecolours.txt saturate.txt \
txiscms =grapheps.scm glob.scm getparam.scm \
vet.scm top-refs.scm hashtab.scm chap.scm comparse.scm\
alist.scm ratize.scm modular.scm dirs.scm priorque.scm queue.scm\
- srfi.scm srfi-1.scm\
+ srfi.scm srfi-1.scm xml-parse.scm\
pnm.scm http-cgi.scm htmlform.scm html4each.scm db2html.scm uri.scm\
dft.scm solid.scm random.scm randinex.scm obj2str.scm ncbi-dna.scm\
minimize.scm factor.scm determ.scm daylight.scm colornam.scm\
@@ -148,7 +143,7 @@ txiscms =grapheps.scm glob.scm getparam.scm \
txifiles =grapheps.txi glob.txi getparam.txi\
vet.txi top-refs.txi hashtab.txi chap.txi comparse.txi\
alist.txi ratize.txi modular.txi dirs.txi priorque.txi queue.txi\
- srfi.txi srfi-1.txi\
+ srfi.txi srfi-1.txi xml-parse.txi\
pnm.txi http-cgi.txi htmlform.txi html4each.txi db2html.txi uri.txi\
dft.txi solid.txi random.txi randinex.txi obj2str.txi ncbi-dna.txi\
minimize.txi factor.txi determ.txi daylight.txi colornam.txi\
@@ -156,17 +151,17 @@ txifiles =grapheps.txi glob.txi getparam.txi\
arraymap.txi phil-spc.txi lineio.txi differ.txi cvs.txi tree.txi\
coerce.txi byte.txi bytenumb.txi matfile.txi tsort.txi manifest.txi\
peanosfc.txi linterp.txi math-integer.txi
-% = `echo $(txiscms) | sed 's%.scm%.txi%g'`
+#txifiles = `echo $(txiscms) | sed 's%.scm%.txi%g'`
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
+ 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 pscheme.init STk.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
tfiles = macrotst.scm dwindtst.scm formatst.scm
sfiles = $(ffiles) $(lfiles) $(revfiles) $(afiles) $(scfiles) $(efiles) \
@@ -175,31 +170,39 @@ allfiles = $(docfiles) $(mkfiles) $(ifiles) $(sfiles) $(tfiles) $(bfiles) \
slib.doc clrnamdb.scm
pinstall: slib.1
- test -d $(mandir) || mkdir $(mandir)
- test -d $(man1dir) || mkdir $(man1dir)
- -cp slib.1 $(man1dir)
+ test -d $(DESTDIR)$(mandir) || mkdir $(DESTDIR)$(mandir)
+ test -d $(DESTDIR)$(man1dir) || mkdir $(DESTDIR)$(man1dir)
+ -cp slib.1 $(DESTDIR)$(man1dir)
install: pinstall clrnamdb.scm
- test -d $(libdir) || mkdir $(libdir)
- test -d $(libslibdir) || mkdir $(libslibdir)
- -cp $(ifiles) $(sfiles) $(bfiles) $(mkfiles) clrnamdb.scm $(libslibdir)
- test -d $(bindir) || mkdir $(bindir)
- echo '#! /bin/sh' > $(bindir)slib
- echo SCHEME_LIBRARY_PATH=$(libslibdir) >> $(bindir)slib
- echo export SCHEME_LIBRARY_PATH >> $(bindir)slib
- echo VERSION=$(VERSION) >> $(bindir)slib
- echo "S48_VICINITY=\"$(S48LIB)\";export S48_VICINITY" >> $(bindir)slib
- cat slib.sh >> $(bindir)slib
- chmod +x $(bindir)slib
+ test -d $(DESTDIR)$(libdir) || mkdir $(DESTDIR)$(libdir)
+ test -d $(DESTDIR)$(libslibdir) || mkdir $(DESTDIR)$(libslibdir)
+ -cp $(ifiles) $(sfiles) $(bfiles) $(mkfiles) clrnamdb.scm $(DESTDIR)$(libslibdir)
+ test -d $(DESTDIR)$(bindir) || mkdir $(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 VERSION=$(VERSION) >> $(DESTDIR)$(bindir)slib
+ echo export SCHEME_LIBRARY_PATH S48_VICINITY >> $(DESTDIR)$(bindir)slib
+ cat slib.sh >> $(DESTDIR)$(bindir)slib
+ chmod +x $(DESTDIR)$(bindir)slib
uninstall:
- -(cd $(libslibdir); rm $(ifiles) $(sfiles) $(bfiles) $(mkfiles) clrnamdb.scm)
- -rm $(bindir)slib
- -rm $(man1dir)slib.1
+ -(cd $(DESTDIR)$(libslibdir); rm $(ifiles) $(sfiles) $(bfiles) $(mkfiles) clrnamdb.scm)
+ -rm $(DESTDIR)$(bindir)slib
+ -rm $(DESTDIR)$(man1dir)slib.1
slib.doc: slib.1
nroff -man $< | ul -tunknown >$@
+slib.html: slib.texi
+ makeinfo --html --no-split --no-warn --force slib.texi
+
+## to build a windows installer
+## make sure makeinfo and NSIS are available on the commandline
+w32install: slib.html
+ makensis slib.nsi
+
#### Stuff for maintaining SLIB below ####
ver = $(VERSION)
@@ -224,17 +227,14 @@ $(txifiles): $(txiscms) schmooz.scm
dvi: slib.dvi
slib.dvi: version.txi slib.texi $(txifiles) $(texifiles)
- texi2dvi -b -c $(srcdir)slib.texi
-slib.fn:
- tex $(srcdir)slib.texi \
- $(srcdir)schmooz.texi
+ texi2dvi -b -c slib.texi
xdvi: slib.dvi
xdvi -s 4 slib.dvi
pdf: $(htmldir)slib.pdf
$(htmldir)slib.pdf: version.txi slib.texi $(txifiles) $(texifiles)
# dvipdf slib.dvi # doesn't have links!
- texi2pdf -b -c $(srcdir)slib.texi
+ texi2pdf -b -c slib.texi
mv slib.pdf $(htmldir)
xpdf: $(htmldir)slib.pdf
xpdf $(htmldir)slib.pdf
@@ -257,17 +257,18 @@ slib.info: slib$(VERSION).info
then infobar $(PREVDOCS)slib.info slib$(VERSION).info slib.info;\
else cp slib$(VERSION).info slib.info;fi
info: installinfo
-installinfo: $(infodir)slib.info
-$(infodir)slib.info: slib.info
- cp -p slib.info $(infodir)slib.info
- -install-info $(infodir)slib.info $(infodir)dir
- -rm $(infodir)slib.info.gz
+installinfo: $(DESTDIR)$(infodir)slib.info
+$(DESTDIR)$(infodir)slib.info: slib.info
+ mkdir -p $(DESTDIR)$(infodir)
+ cp -p slib.info $(DESTDIR)$(infodir)slib.info
+ -install-info $(DESTDIR)$(infodir)slib.info $(DESTDIR)$(infodir)dir
+ -rm $(DESTDIR)$(infodir)slib.info.gz
infoz: installinfoz
-installinfoz: $(infodir)slib.info.gz
-$(infodir)slib.info.gz: $(infodir)slib.info
- gzip -f $(infodir)slib.info
+installinfoz: $(DESTDIR)$(infodir)slib.info.gz
+$(DESTDIR)$(infodir)slib.info.gz: $(DESTDIR)$(infodir)slib.info
+ gzip -f $(DESTDIR)$(infodir)slib.info
-docs: $(infodir)slib.info.gz $(htmldir)slib_toc.html slib.dvi \
+docs: $(DESTDIR)$(infodir)slib.info.gz $(htmldir)slib_toc.html slib.dvi \
$(htmldir)slib.pdf slib.doc
xdvi -s 4 slib.dvi
@@ -276,23 +277,21 @@ CHPAT=$(HOME)/bin/chpat
RSYNC=rsync --rsync-path=bin/rsync -bav
UPLOADEE=swissnet_upload
dest = $(HOME)/dist/
-DOSCM = /misc/usb1/scm/
+DOSCM = /c/Voluntocracy/dist/
temp/slib: $(allfiles)
-rm -rf temp
- mkdir temp
- mkdir temp/slib
+ mkdir -p temp/slib
ln $(allfiles) temp/slib
infotemp/slib: slib.info
-rm -rf infotemp
- mkdir infotemp
- mkdir infotemp/slib
+ mkdir -p infotemp/slib
ln slib.info slib.info-* infotemp/slib
#For change-barred HTML.
prevdocs: $(PREVDOCS)slib_toc.html $(PREVDOCS)slib.info
$(PREVDOCS)slib_toc.html:
-$(PREVDOCS)slib.info: srcdir.mk Makefile
+$(PREVDOCS)slib.info: Makefile
cd $(PREVDOCS); unzip -ao $(dest)slib*.zip
rm $(PREVDOCS)slib/slib.info
cd $(PREVDOCS)slib; make slib.info; make slib_toc.html
@@ -307,27 +306,15 @@ $(dest)slib.info.zip: infotemp/slib
release: dist pdf tar.gz # rpm
cvs tag -F slib$(VERSION)
cp ANNOUNCE $(htmldir)SLIB_ANNOUNCE.txt
- cp COPYING $(htmldir)SLIB_COPYING.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 $(htmldir)slib.pdf \
+ $(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/
-# $(MAKE) indiana
-indiana:
- upload $(dest)slib$(VERSION).zip ftp@ftp.cs.indiana.edu:/pub/scheme-repository/incoming
- echo -e \
- 'I have uploaded slib$(VERSION).zip to ftp.cs.indiana.edu:/pub/scheme-repository/incoming\n' \
- 'for placement into ftp.cs.indiana.edu:/pub/scheme-repository/code/lib/' \
- | mail -s 'SLIB upload' -b jaffer scheme-repository-request@cs.indiana.edu
-
-postnews:
- echo -e "Newsgroups: comp.lang.scheme\n" | cat - ANNOUNCE | \
- inews -h -O -S \
- -f "announce@voluntocracy.org (Aubrey Jaffer & Radey Shouman)" \
- -t "SLIB$(VERSION) Released" -d world
upzip: $(HOME)/pub/slib.zip
$(RSYNC) $(HOME)/pub/slib.zip $(UPLOADEE):pub/
@@ -358,10 +345,11 @@ slib.com: temp/slib
zip: slib.zip
slib.zip: temp/slib
$(makedev) DEST=../ PROD=slib zip
-doszip: $(DOSCM)dist/slib$(VERSION).zip
-$(DOSCM)dist/slib$(VERSION).zip: temp/slib
- $(makedev) DEST=$(DOSCM)dist/ PROD=slib ver=$(VERSION) zip
- zip -d $(DOSCM)dist/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
@@ -379,9 +367,7 @@ psdocfiles=article.bbl article.tex manual.bbl manual.tex quick-intro.tex
psdtemp/slib:
-rm -rf psdtemp
- mkdir psdtemp
- mkdir psdtemp/slib
- mkdir psdtemp/slib/psd
+ mkdir -p psdtemp/slib/psd
cd psd; ln $(psdfiles) ../psdtemp/slib/psd
mkdir psdtemp/slib/psd/doc
cd psd/doc; ln $(psdocfiles) ../../psdtemp/slib/psd/doc
@@ -397,26 +383,28 @@ new:
echo>> change
cat ChangeLog >> change
mv -f change ChangeLog
- $(CHPAT) slib$(VERSION) slib$(ver) ANNOUNCE FAQ ../scm/ANNOUNCE \
+ $(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 \
- $(DOSCM)dist/install.bat $(DOSCM)dist/makefile \
- $(DOSCM)dist/mkdisk.bat
+ $(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 \
- $(DOSCM)dist/install.bat $(DOSCM)dist/makefile \
- $(DOSCM)dist/mkdisk.bat
- $(CHPAT) $(VERSION) $(ver) README slib.texi require.scm Makefile \
- $(htmldir)SLIB.html slib.spec scheme48.init
+ $(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)
@@ -438,7 +426,7 @@ clean:
distclean: realclean
realclean:
-rm -f *~ *.bak *.orig *.rej TAGS core a.out *.o \#*
- -rm -f slib.info* slib.?? slib.???
- -rm -rf *temp
+ -rm -f slib.info* slib.?? slib.html
+ -rm -rf *temp SLIB-*.exe
realempty: temp/slib
-rm -f $(allfiles)