Commit 9ba9bfb9 authored by Samuel Martin's avatar Samuel Martin Committed by Thomas Petazzoni
Browse files

pkg-*targets.mk: factorize and fix $(PKG)_SRCDIR and $(PKG)_BUILDDIR declaration 



Signed-off-by: default avatarSamuel Martin <s.martin49@gmail.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 736ce2f3

package/pkg-autotools.mk

+0 −10
Original line number Diff line number Diff line
@@ -54,15 +54,6 @@ endef 


define inner-autotools-package



# define package-specific variables to default values

ifndef $(2)_SUBDIR

 ifdef $(3)_SUBDIR

  $(2)_SUBDIR = $($(3)_SUBDIR)

 else

  $(2)_SUBDIR ?=

 endif

endif



ifndef $(2)_LIBTOOL_PATCH

 ifdef $(3)_LIBTOOL_PATCH

  $(2)_LIBTOOL_PATCH = $($(3)_LIBTOOL_PATCH)
@@ -91,7 +82,6 @@ $(2)_CLEAN_OPT ?= clean 
$(2)_UNINSTALL_STAGING_OPT	?= DESTDIR=$$(STAGING_DIR) uninstall

$(2)_UNINSTALL_TARGET_OPT	?= DESTDIR=$$(TARGET_DIR)  uninstall



$(2)_SRCDIR                     = $$($(2)_DIR)/$$($(2)_SUBDIR)



#

# Configure step. Only define it if not already defined by the package

package/pkg-cmake.mk

+0 −9
Original line number Diff line number Diff line
@@ -37,15 +37,6 @@ 


define inner-cmake-package



# define package-specific variables to default values

ifndef $(2)_SUBDIR

 ifdef $(3)_SUBDIR

  $(2)_SUBDIR = $($(3)_SUBDIR)

 else

  $(2)_SUBDIR ?=

 endif

endif



$(2)_CONF_ENV			?=

$(2)_CONF_OPT			?=

$(2)_MAKE			?= $(MAKE)

package/pkg-generic.mk

+11 −0
Original line number Diff line number Diff line
@@ -204,6 +204,17 @@ $(2)_BASE_NAME = $(1)-$$($(2)_VERSION) 
$(2)_DL_DIR	=  $$(DL_DIR)/$$($(2)_BASE_NAME)

$(2)_DIR	=  $$(BUILD_DIR)/$$($(2)_BASE_NAME)



ifndef $(3)_SUBDIR

 ifdef $(2)_SUBDIR

  $(3)_SUBDIR = $$($(2)_SUBDIR)

 else

  $(3)_SUBDIR ?=

 endif

endif



$(2)_SRCDIR		       = $$($(2)_DIR)/$$($(2)_SUBDIR)

$(2)_BUILDDIR		       ?= $$($(2)_SRCDIR)



ifneq ($$($(2)_OVERRIDE_SRCDIR),)

$(2)_VERSION = custom

endif