install libs into instdir/lib and scripts into instdir/bin

This commit is contained in:
Zooko O'Whielacronx 2007-04-30 17:49:10 -07:00
parent e258921b9d
commit 07eb9999f2
2 changed files with 15 additions and 14 deletions

View File

@ -36,33 +36,33 @@ else
endif
ifneq ($(PYTHONPATH),)
PYTHONPATH := "$(PYTHONPATH)$(PATHSEP)$(INSTDIR)"
PYTHONPATH := "$(PYTHONPATH)$(PATHSEP)$(INSTDIR)/lib"
else
PYTHONPATH := "$(INSTDIR)"
PYTHONPATH := "$(INSTDIR)/lib"
endif
TRIAL=$(PYTHON) -u "$(TRIALPATH)" --rterrors --reactor=$(REACTOR)
show-instdir:
@echo $(INSTDIR)
@echo $(INSTDIR)/lib
PP=PYTHONPATH=$(PYTHONPATH)
.PHONY: build
build: build-zfec build-Crypto build-foolscap
$(PP) $(PYTHON) ./setup.py $(EXTRA_SETUP_ARGS) install --prefix="" --root="$(INSTDIR)" --install-lib="" --install-scripts="scripts"
$(PP) $(PYTHON) ./setup.py $(EXTRA_SETUP_ARGS) install --prefix="." --root="$(INSTDIR)" --install-lib="lib" --install-scripts="bin"
build-zfec:
cd src/zfec && \
$(PP) $(PYTHON) ./setup.py $(EXTRA_SETUP_ARGS) install --prefix="" --root="$(INSTDIR)" --install-lib="" --install-scripts="scripts"
$(PP) $(PYTHON) ./setup.py $(EXTRA_SETUP_ARGS) install --prefix="." --root="$(INSTDIR)" --install-lib="lib" --install-scripts="bin"
build-foolscap:
cd src/foolscap && \
$(PP) $(PYTHON) ./setup.py $(EXTRA_SETUP_ARGS) install --prefix="" --root="$(INSTDIR)" --install-lib="" --install-scripts="scripts"
$(PP) $(PYTHON) ./setup.py $(EXTRA_SETUP_ARGS) install --prefix="." --root="$(INSTDIR)" --install-lib="lib" --install-scripts="bin"
build-Crypto:
cd src/Crypto && \
$(PP) $(PYTHON) ./setup.py $(EXTRA_SETUP_ARGS) install --prefix="" --root="$(INSTDIR)" --install-lib="" --install-scripts="scripts"
$(PP) $(PYTHON) ./setup.py $(EXTRA_SETUP_ARGS) install --prefix="." --root="$(INSTDIR)" --install-lib="lib" --install-scripts="bin"
clean-zfec:
-cd src/zfec && \
@ -120,7 +120,7 @@ test-figleaf: build
$(PP) $(TRIAL) --reporter=bwverbose-figleaf $(TEST)
figleaf-output:
$(PP) $(PYTHON) misc/figleaf2html -d coverage-html -r $(INSTDIR) -x misc/figleaf.excludes
$(PP) $(PYTHON) misc/figleaf2html -d coverage-html -r $(INSTDIR)/lib -x misc/figleaf.excludes
@echo "now point your browser at coverage-html/index.html"
# after doing test-figleaf and figleaf-output, point your browser at
# coverage-html/index.html
@ -136,7 +136,7 @@ upload-figleaf:
endif
.figleaf.el: .figleaf
$(PP) $(PYTHON) misc/figleaf2el.py .figleaf $(INSTDIR)
$(PP) $(PYTHON) misc/figleaf2el.py .figleaf $(INSTDIR)/lib
pyflakes:
$(PP) $(PYTHON) -OOu `which pyflakes` src/allmydata

11
README
View File

@ -130,7 +130,8 @@ INSTALLING:
To run from a source tree (without installing first), type 'make', which
will put all the necessary libraries into a local directory named
"./instdir/", which you can then add to your PYTHONPATH .
"./instdir/lib", which you can then add to your PYTHONPATH . (It will put
executables into "./instdir/bin".)
To Test That It Is Properly Installed:
@ -152,10 +153,10 @@ RUNNING:
If you installed one of the debian packages constructed by "make deb-*" then
it creates an 'allmydata-tahoe' executable, usually in /usr/bin . If you
didn't install a package you can find allmydata-tahoe in bin/ . This tool is
used to create, start, and stop nodes. Each node lives in a separate base
directory, inside of which you can add files to configure and control the
node. Nodes also read and write files within that directory.
didn't install a package you can find allmydata-tahoe in ./instdir/bin/
. This tool is used to create, start, and stop nodes. Each node lives in a
separate base directory, inside of which you can add files to configure and
control the node. Nodes also read and write files within that directory.
A grid consists of a single central 'introducer and vdrive' node and a large
number of 'client' nodes. If you are joining an existing grid, the