[FIX] debian packaging: removed old Makefile + fixed addons path reso…

…lution bzr revid: [email protected]
EssentNovaTeam · Jan 17, 2011 · dd73fb1 · dd73fb1
1 parent 61bafa2
commit dd73fb1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 46 deletions.
diff --git a/Makefile b/Makefile
diff --git 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