Install bsr into default location

diff --git a/Makefile b/Makefile
index 8114ce1..28f9600 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,7 @@ docs: man html pdf
 
 install: all
        python setup.py install --prefix=${PREFIX}
-       cd bsr && python setup.py install --install-scripts=/usr/local/bin --prefix=/usr/local && cd ..
+       cd bsr && python setup.py install --prefix=${PREFIX} && cd ..
 
 clean:
        rm -rf {build/,dist/,*.egg-info/}

diff --git a/debian/gbs-bsr.install b/debian/gbs-bsr.install
index 09bca53..1121032 100644 (file)
--- a/debian/gbs-bsr.install
+++ b/debian/gbs-bsr.install
@@ -1,8 +1,8 @@
-usr/local/lib/python*/*packages/bsr/*.py
-usr/local/lib/python*/*packages/bsr/analyzer/*.py
-usr/local/lib/python*/*packages/bsr/gbs/*.py
-usr/local/lib/python*/*packages/bsr/network/*.py
-usr/local/lib/python*/*packages/bsr/report/*.py
-usr/local/lib/python*/*packages/bsr/utility/*.py
-usr/local/lib/python*/*packages/bsr/web_dist/*
-usr/local/bin/bsr
+usr/lib/python*/*packages/bsr/*.py
+usr/lib/python*/*packages/bsr/analyzer/*.py
+usr/lib/python*/*packages/bsr/gbs/*.py
+usr/lib/python*/*packages/bsr/network/*.py
+usr/lib/python*/*packages/bsr/report/*.py
+usr/lib/python*/*packages/bsr/utility/*.py
+usr/lib/python*/*packages/bsr/web_dist/*
+usr/bin/bsr

diff --git a/debian/rules b/debian/rules
index 3d82e78..7f3cef3 100644 (file)
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@
 override_dh_auto_install:
        python setup.py install --root=debian/tmp --prefix=/usr
        make man
-       cd bsr && python setup.py install --install-scripts=/usr/local/bin --root=../debian/tmp --prefix=/usr/local && cd ..
+       cd bsr && python setup.py install --root=../debian/tmp --prefix=/usr && cd ..
        mkdir -p debian/tmp/usr/share/man/man1
        mkdir -p debian/tmp/usr/share/gbs
        install -m644 docs/gbs.1 debian/tmp/usr/share/man/man1