diff options
| author | Olivier Dony <odo@openerp.com> | 2011-01-17 20:50:47 +0100 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2011-01-17 20:50:47 +0100 |
| commit | dd73fb1cace240861a445b8916efbdce3e9daf7d (patch) | |
| tree | 94b2df76705a14dba2a42480155e8cbc7a7c1a0c /debian | |
| parent | 61bafa269f343fa98547d5cecd36432b41a8799b (diff) | |
[FIX] debian packaging: removed old Makefile + fixed addons path resolution
bzr revid: odo@openerp.com-20110117195047-a74fb95y524msxty
Diffstat (limited to 'debian')
| -rwxr-xr-x | debian/rules | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/debian/rules b/debian/rules index b388a72fce6..dafe2c3b906 100755 --- a/debian/rules +++ b/debian/rules @@ -1,5 +1,7 @@ #!/usr/bin/make -f +EXTRA_MODULES_PATH ?= ../addons + %: dh ${@} @@ -10,13 +12,13 @@ override_dh_auto_clean: override_dh_auto_install: # Adding ALL addons to the server package - if [ -d ../addons ] ; then \ - pushd ../addons ; \ + if [ -d "${EXTRA_MODULES_PATH}" ] ; then \ + cd ${EXTRA_MODULES_PATH} ; \ echo > server_modules.list ; \ for ADD_DIR in * ; do \ [ -d "$$ADD_DIR" ] && [ -r "$$ADD_DIR"/__openerp__.py ] && echo "$$ADD_DIR" >> server_modules.list ; \ done ; \ - popd ; fi + fi NO_CHECK_MODULES=1 python setup.py install --install-layout=deb --no-compile --root=$(CURDIR)/debian/openerp-server # Adjusting program location |