From 61395f44fc3dc54a6747f72c208b0630199f0a29 Mon Sep 17 00:00:00 2001 From: James Duley Date: Sat, 31 Jan 2015 16:15:53 +1300 Subject: [PATCH] OP-1695 Ubuntu PPA: add debian target --- package/Linux.mk | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/package/Linux.mk b/package/Linux.mk index a6fedb320..23edb1ed8 100644 --- a/package/Linux.mk +++ b/package/Linux.mk @@ -7,8 +7,7 @@ ifndef OPENPILOT_IS_COOL endif DEB_VER := $(subst RELEASE-,,$(PACKAGE_LBL))-1 -DEB_DIR := $(ROOT_DIR)/package/linux/debian -DEB_BUILD_DIR := $(ROOT_DIR)/debian +DEB_DIR := package/linux/debian SED_DATE_STRG = $(shell date -R) SED_SCRIPT = s//$(DEB_VER)/;s//$(SED_DATE_STRG)/ @@ -17,14 +16,17 @@ DEB_ARCH := $(shell dpkg --print-architecture) DEB_PACKAGE_NAME := openpilot_$(DEB_VER)_$(DEB_ARCH) .PHONY: package -package: +package: debian $(V1) echo "Building Linux package, please wait..." - $(V1) cp -rL $(DEB_DIR) $(DEB_BUILD_DIR) - $(V1) sed -i -e "$(SED_SCRIPT)" $(DEB_BUILD_DIR)/changelog $(V1) dpkg-buildpackage -b -us -uc $(V1) mv $(ROOT_DIR)/../$(DEB_PACKAGE_NAME).deb $(PACKAGE_DIR) $(V1) mv $(ROOT_DIR)/../$(DEB_PACKAGE_NAME).changes $(PACKAGE_DIR) - $(V1) rm -rf $(DEB_BUILD_DIR) + $(V1) rm -r debian + +debian: $(DEB_DIR) + $(V1) cp -rL $(DEB_DIR) debian + $(V1) sed -i -e "$(SED_SCRIPT)" debian/changelog + ############################## #