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

diff --git a/GNUmakefile b/GNUmakefile
index 31c36ff239c251feb11373e29e9f8b9ce44afac9..3fa3bd0b4c89b36c30a000c3607ae61591187fdb 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -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

diff --git a/README b/README
index 9ca421a80f6d5c88369c48f1f46f83824e4e90ff..71f5990b9c01798157a7c686aca2a9350f7fdf79 100644 (file)
--- a/README
+++ b/README
@@ -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