Fixed installation. Avoid very long commands. Install directory is /usr/local (vs /tmp/usr/local). Make DETAILS by default. Install README and DETAILS with documentation.

This commit is contained in:
Anthony Carrico 2003-03-13 03:38:30 +00:00
parent ace91c90af
commit 7e87daaa4d
2 changed files with 38 additions and 21 deletions

View File

@ -1,6 +1,6 @@
SHELL = /bin/sh SHELL = /bin/sh
prefix = /tmp/usr/local prefix = /usr/local
libdir = $(prefix)/lib libdir = $(prefix)/lib
docdir = $(prefix)/share/doc docdir = $(prefix)/share/doc
pkglibdir = $(libdir)/sunterlib pkglibdir = $(libdir)/sunterlib
@ -60,18 +60,26 @@ scsh-targets := interfaces.scm packages.scm
targets := $(s48-targets) $(scsh-targets) DETAILS targets := $(s48-targets) $(scsh-targets) DETAILS
.PHONY: all s48 scsh .PHONY: all s48 scsh
all : s48 scsh all : s48 scsh DETAILS
s48 : $(s48-targets) s48 : $(s48-targets)
scsh : $(scsh-targets) scsh : $(scsh-targets)
s48-interfaces.scm : $(s48-interfaces) build/header.scm s48-interfaces.scm : $(s48-interfaces) build/header.scm
cat build/header.scm $(s48-interfaces) > s48-interfaces.scm cat build/header.scm > s48-interfaces.scm
for interface in $(s48-interfaces) ; \
do \
cat $${interface} >> s48-interfaces.scm ; \
done
s48-packages.scm : $(s48-packages) build/header.scm s48-packages.scm : $(s48-packages) build/header.scm
build/xpackages.scm s48-packages.scm build/header.scm $(s48-packages) build/xpackages.scm s48-packages.scm build/header.scm $(s48-packages)
interfaces.scm : $(s48-interfaces) $(scsh-interfaces) build/header.scm interfaces.scm : $(s48-interfaces) $(scsh-interfaces) build/header.scm
cat build/header.scm $(s48-interfaces) $(scsh-interfaces) > interfaces.scm cat build/header.scm > interfaces.scm
for interface in $(s48-interfaces) $(scsh-interfaces) ; \
do \
cat $${interface} >> interfaces.scm ; \
done
packages.scm : $(s48-packages) $(scsh-packages) build/header.scm packages.scm : $(s48-packages) $(scsh-packages) build/header.scm
build/xpackages.scm packages.scm build/header.scm $(s48-packages) $(scsh-packages) build/xpackages.scm packages.scm build/header.scm $(s48-packages) $(scsh-packages)
@ -80,26 +88,33 @@ DETAILS : $(s48-authors) $(s48-blurbs) $(scsh-authors) $(scsh-blurbs)
build/details.scm build/details.scm
.PHONY : install uninstall .PHONY : install uninstall
install : s48 scsh install : s48 scsh DETAILS
$(INSTALL) -d $(pkglibdir) $(INSTALL) -d $(pkglibdir)
$(INSTALL_DATA) s48-interfaces.scm s48-packages.scm $(pkglibdir) $(INSTALL_DATA) s48-interfaces.scm s48-packages.scm $(pkglibdir)
$(INSTALL_DATA) interfaces.scm packages.scm $(pkglibdir) $(INSTALL_DATA) interfaces.scm packages.scm $(pkglibdir)
$(foreach s48-src, \ $(INSTALL) -d $(pkgdocdir)
$(s48-srcs), \ $(INSTALL_DATA) README $(pkgdocdir)
$(INSTALL) -d $(pkglibdir)/$(dir $(s48-src)); \ $(INSTALL_DATA) DETAILS $(pkgdocdir)
$(INSTALL_DATA) $(s48-src) $(pkglibdir)/$(s48-src);) for s48src in $(s48-srcs); \
$(foreach s48-doc, \ do \
$(s48-docs), \ $(INSTALL) -d $(pkglibdir)/`dirname $${s48src}`; \
$(INSTALL) -d $(pkgdocdir)/$(dir $(s48-doc)); \ $(INSTALL_DATA) $${s48src} $(pkglibdir)/$${s48src}; \
$(INSTALL_DATA) $(s48-doc) $(pkgdocdir)/$(s48-doc);) done
$(foreach scsh-src, \ for s48doc in $(s48-docs); \
$(scsh-srcs), \ do \
$(INSTALL) -d $(pkglibdir)/$(dir $(scsh-src)); \ $(INSTALL) -d $(pkgdocdir)/`dirname $${s48doc}`; \
$(INSTALL_DATA) $(scsh-src) $(pkglibdir)/$(scsh-src);) $(INSTALL_DATA) $${s48doc} $(pkgdocdir)/$${s48doc}; \
$(foreach scsh-doc, \ done
$(scsh-docs), \ for scshsrc in $(scsh-srcs); \
$(INSTALL) -d $(pkgdocdir)/$(dir $(scsh-doc)); \ do \
$(INSTALL_DATA) $(scsh-doc) $(pkgdocdir)/$(scsh-doc);) $(INSTALL) -d $(pkglibdir)/`dirname $${scshsrc}`; \
$(INSTALL_DATA) $${scshsrc} $(pkglibdir)/$${scshsrc}; \
done
for scshdoc in $(scsh-docs); \
do \
$(INSTALL) -d $(pkgdocdir)/`dirname $${scshdoc}`; \
$(INSTALL_DATA) $${scshdoc} $(pkgdocdir)/$${scshdoc}; \
done
uninstall : uninstall :
-rm -rf $(pkglibdir) $(pkgdocdir) -rm -rf $(pkglibdir) $(pkgdocdir)

2
NEWS
View File

@ -1,4 +1,6 @@
version 0.3 version 0.3
* Added DETAILS (autogenerated)
* Fixed installation
version 0.2 - 2003-02-25 version 0.2 - 2003-02-25
* Added INSTALL, README.admin, README.contrib. * Added INSTALL, README.admin, README.contrib.