From dd73fb1cace240861a445b8916efbdce3e9daf7d Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 17 Jan 2011 20:50:47 +0100
Subject: [PATCH] [FIX] debian packaging: removed old Makefile + fixed addons
 path resolution

bzr revid: odo@openerp.com-20110117195047-a74fb95y524msxty
---
 Makefile     | 43 -------------------------------------------
 debian/rules |  8 +++++---
 2 files changed, 5 insertions(+), 46 deletions(-)
 delete mode 100644 Makefile

diff --git a/Makefile b/Makefile
deleted file mode 100644
index 782a3d51a3f..00000000000
--- a/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- makefile -*-
-
-addons-path := bin/addons/ 
-extra-addons:= ''
-root-path := bin/  
-port := 8069
-net_port := 8070 
-module := base
-database := terp
-language := fr_FR
-i18n-import := bin/addons/base/i18n/fr_FR.po
-interrogation_file := bin/addons/base_quality_interrogation.py
-login := admin
-password := admin
-
-start:        
-	python $(interrogation_file) start-server --root-path=$(root-path) --addons-path=$(addons-path) --port=$(port) --net_port=$(net_port)
-
-create-db:
-	python $(interrogation_file) create-db --database=$(database) --root-path=$(root-path) --addons-path=$(addons-path) --port=$(port) --net_port=$(net_port) --login=$(login) --password=$(password)
-
-drop-db:
-	python $(interrogation_file) drop-db --database=$(database) --root-path=$(root-path) --addons-path=$(addons-path) --port=$(port) --net_port=$(net_port)
-
-install-module:	
-	python $(interrogation_file) install-module --modules=$(module) --database=$(database) --root-path=$(root-path) --addons-path=$(addons-path) --extra-addons=$(extra-addons) --net_port=$(net_port) --port=$(port) --login=$(login) --password=$(password)
-
-upgrade-module:	
-	python $(interrogation_file) upgrade-module --modules=$(module) --database=$(database) --root-path=$(root-path) --addons-path=$(addons-path) --port=$(port) --net_port=$(net_port) --login=$(login)  --password=$(password)
-	
-
-install-translation:    
-	python $(interrogation_file) install-translation --database=$(database) --translate-in=$(i18n-import) --net_port=$(net_port) --port=$(port) --login=$(login) --password=$(password) --root-path=$(root-path) --addons-path=$(addons-path)
-    
-
-version:
-	python bin/openerp-server.py --version
-
-check-quality:	
-	python $(interrogation_file) check-quality --database=$(database) --modules=$(module)  --net_port=$(net_port)        --port=$(port) --login=$(login) --password=$(password) --addons-path=$(addons-path) --root-path=$(root-path)
-	
-
-
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