diff --git a/make/bootstrap.mk b/make/bootstrap.mk index 5e07f9d5..6e342ba5 100644 --- a/make/bootstrap.mk +++ b/make/bootstrap.mk @@ -11,6 +11,7 @@ BOOTSTRAP += $(IMAGE_DIR) BOOTSTRAP += $(UPDATE_DIR) BOOTSTRAP += $(HOST_DIR)/bin BOOTSTRAP += cross-libs +BOOTSTRAP += bins BOOTSTRAP += includes BOOTSTRAP += libs BOOTSTRAP += firmware @@ -35,7 +36,6 @@ skeleton: | $(TARGET_DIR) target-dir: mkdir -p $(TARGET_DIR) - mkdir -p $(TARGET_DIR)/bin ifeq ($(BOXSERIES), hd51) mkdir -p $(TARGET_DIR)/boot endif @@ -78,6 +78,9 @@ $(HOST_DIR): $(HOST_DIR)/bin: $(HOST_DIR) mkdir -p $@ +$(TARGET_BIN_DIR): | $(TARGET_DIR) + mkdir -p $@ + $(TARGET_INCLUDE_DIR): | $(TARGET_DIR) mkdir -p $@ ifeq ($(BOXTYPE), armbox) @@ -140,6 +143,8 @@ ifeq ($(BOXSERIES), hd51) ln -sf ld-2.23.so ld-linux.so.3 endif +bins: $(TARGET_BIN_DIR) + includes: $(TARGET_INCLUDE_DIR) libs: $(TARGET_LIB_DIR) static-libs $(STATIC_LIB_DIR) @@ -153,6 +158,7 @@ var-update: $(TARGET_DIR)/var/update # ----------------------------------------------------------------------------- # hack to make sure they are always copied +PHONY += $(TARGET_BIN_DIR) PHONY += $(TARGET_INCLUDE_DIR) PHONY += $(TARGET_LIB_DIR) PHONY += $(TARGET_LIB_DIR)/firmware @@ -166,6 +172,7 @@ PHONY += bootstrap PHONY += skeleton PHONY += target-dir PHONY += cross-libs +PHONY += bins PHONY += includes PHONY += libs PHONY += firmware diff --git a/make/environment-build.mk b/make/environment-build.mk index b0f51542..402cb4f8 100644 --- a/make/environment-build.mk +++ b/make/environment-build.mk @@ -237,6 +237,7 @@ else ifeq ($(BOXSERIES), hd51) endif STATIC_LIB_DIR = $(STATIC_DIR)/lib +TARGET_BIN_DIR = $(TARGET_DIR)/bin TARGET_LIB_DIR = $(TARGET_DIR)/lib TARGET_MODULES_DIR = $(TARGET_LIB_DIR)/modules/$(KERNEL_VERSION_FULL) TARGET_INCLUDE_DIR = $(TARGET_DIR)/include diff --git a/make/environment-target.mk b/make/environment-target.mk index 2c7f2473..5762af88 100644 --- a/make/environment-target.mk +++ b/make/environment-target.mk @@ -17,7 +17,6 @@ VARCONFIG = $(TARGET_DIR)/var/tuxbox/config VARINITD = $(TARGET_DIR)/var/etc/init.d VARPLUGINS = $(TARGET_DIR)/var/tuxbox/plugins -$(BIN) \ $(ETCINITD) \ $(LIBPLUGINS) \ $(SBIN) \