mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2024-12-01 09:24:10 +01:00
OP-1790: fix up packging make dependencies
This commit is contained in:
parent
feef238337
commit
26266f1dee
8
Makefile
8
Makefile
@ -792,14 +792,10 @@ PACKAGE_NAME := OpenPilot
|
||||
PACKAGE_SEP := -
|
||||
PACKAGE_FULL_NAME := $(PACKAGE_NAME)$(PACKAGE_SEP)$(PACKAGE_LBL)
|
||||
|
||||
# Source distribution is never dirty because it uses git archive
|
||||
DIST_NAME := $(DIST_DIR)/$(subst dirty-,,$(PACKAGE_FULL_NAME)).tar
|
||||
|
||||
.PHONY: package
|
||||
|
||||
include $(ROOT_DIR)/package/$(UNAME).mk
|
||||
|
||||
package: all_fw all_ground uavobjects_matlab
|
||||
# Source distribution is never dirty because it uses git archive
|
||||
DIST_NAME := $(DIST_DIR)/$(subst dirty-,,$(PACKAGE_FULL_NAME)).tar
|
||||
|
||||
##############################
|
||||
#
|
||||
|
@ -7,7 +7,7 @@ ifndef OPENPILOT_IS_COOL
|
||||
endif
|
||||
|
||||
.PHONY: package
|
||||
package: | $(PACKAGE_DIR)
|
||||
package: openpilotgcs uavobjects_matlab | $(PACKAGE_DIR)
|
||||
ifneq ($(GCS_BUILD_CONF),release)
|
||||
# We can only package release builds
|
||||
$(error Packaging is currently supported for release builds only)
|
||||
|
@ -15,7 +15,7 @@ NSIS_TEMPLATE := $(NSIS_WINX86)/openpilotgcs.tpl
|
||||
NSIS_HEADER := $(OPGCSSYNTHDIR)/openpilotgcs.nsh
|
||||
|
||||
.PHONY: package
|
||||
package: | $(PACKAGE_DIR)
|
||||
package: openpilotgcs uavobjects_matlab | $(PACKAGE_DIR)
|
||||
ifneq ($(GCS_BUILD_CONF),release)
|
||||
# We can only package release builds
|
||||
$(error Packaging is currently supported for release builds only)
|
||||
|
@ -12,7 +12,7 @@ export DH_OPTIONS
|
||||
dh $@
|
||||
|
||||
override_dh_auto_build:
|
||||
dh_auto_build -- all
|
||||
dh_auto_build -- opfw_resource openpilotgcs
|
||||
|
||||
override_dh_auto_install:
|
||||
dh_auto_install -- prefix=/usr
|
||||
|
Loading…
Reference in New Issue
Block a user