From 8f868d9e3539a56907ded93a30abd79c5a1e1050 Mon Sep 17 00:00:00 2001 From: Philippe Renon <op.filnet@yahoo.fr> Date: Fri, 25 Sep 2015 23:36:25 +0200 Subject: [PATCH] LP-30 fixed some pathes --- make/3rdparty/marble/marble.mk | 4 ++-- make/3rdparty/osgearth/osgearth.mk | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/make/3rdparty/marble/marble.mk b/make/3rdparty/marble/marble.mk index 21cf5898f..3acb4fa8f 100644 --- a/make/3rdparty/marble/marble.mk +++ b/make/3rdparty/marble/marble.mk @@ -66,7 +66,7 @@ MARBLE_SRC_DIR := $(ROOT_DIR)/3rdparty/marble MARBLE_BUILD_DIR := $(BUILD_DIR)/3rdparty/$(MARBLE_NAME) MARBLE_INSTALL_DIR := $(BUILD_DIR)/3rdparty/install/$(MARBLE_NAME) MARBLE_DATA_DIR := $(MARBLE_INSTALL_DIR)/$(MARBLE_DATA_BASE_DIR) -MARBLE_PATCH_FILE := $(ROOT_DIR)/make/3rdparty/marble-$(MARBLE_VERSION).patch +MARBLE_PATCH_FILE := $(ROOT_DIR)/make/3rdparty/marble/marble-$(MARBLE_VERSION).patch .PHONY: marble marble: @@ -96,7 +96,7 @@ marble: .PHONY: package_marble package_marble: @$(ECHO) "Packaging $(call toprel, $(MARBLE_INSTALL_DIR)) into $(notdir $(MARBLE_INSTALL_DIR)).tar" - #$(V1) $(CP) $(ROOT_DIR)/make/3rdparty/LibrePilotReadme.txt $(MARBLE_INSTALL_DIR)/ + #$(V1) $(CP) $(ROOT_DIR)/make/3rdparty/marble/LibrePilotReadme.txt $(MARBLE_INSTALL_DIR)/ $(V1) ( \ $(CD) $(MARBLE_INSTALL_DIR)/.. && \ $(TAR) cf $(notdir $(MARBLE_INSTALL_DIR)).tar $(notdir $(MARBLE_INSTALL_DIR)) && \ diff --git a/make/3rdparty/osgearth/osgearth.mk b/make/3rdparty/osgearth/osgearth.mk index c880a365a..8553a8f93 100644 --- a/make/3rdparty/osgearth/osgearth.mk +++ b/make/3rdparty/osgearth/osgearth.mk @@ -123,7 +123,7 @@ OSG_NAME := $(OSG_NAME_PREFIX)$(OSG_NAME)$(OSG_NAME_SUFIX) OSG_SRC_DIR := $(ROOT_DIR)/3rdparty/osg OSG_BUILD_DIR := $(BUILD_DIR)/3rdparty/$(OSG_NAME) OSG_INSTALL_DIR := $(BUILD_DIR)/3rdparty/install/$(OSG_NAME) -OSG_PATCH_FILE := $(ROOT_DIR)/make/3rdparty/osg-$(OSG_VERSION).patch +OSG_PATCH_FILE := $(ROOT_DIR)/make/3rdparty/osgearth/osg-$(OSG_VERSION).patch .PHONY: osg osg: @@ -150,7 +150,7 @@ osg: .PHONY: package_osg package_osg: @$(ECHO) "Packaging $(call toprel, $(OSG_INSTALL_DIR)) into $(notdir $(OSG_INSTALL_DIR)).tar" - #$(V1) $(CP) $(ROOT_DIR)/make/3rdparty/LibrePilotReadme.txt $(OSG_INSTALL_DIR)/ + #$(V1) $(CP) $(ROOT_DIR)/make/3rdparty/osgearth/LibrePilotReadme.txt $(OSG_INSTALL_DIR)/ $(V1) ( \ $(CD) $(OSG_INSTALL_DIR)/.. && \ $(TAR) cf $(notdir $(OSG_INSTALL_DIR)).tar $(notdir $(OSG_INSTALL_DIR)) && \ @@ -250,7 +250,7 @@ OSGEARTH_BUILD_DIR := $(BUILD_DIR)/3rdparty/$(OSGEARTH_NAME) # osgearth will be installed into osg (there is an official option to do that but it seems broken on mingw) #OSGEARTH_INSTALL_DIR := $(BUILD_DIR)/3rdparty/install/$(OSGEARTH_NAME) OSGEARTH_INSTALL_DIR := $(OSG_INSTALL_DIR) -OSGEARTH_PATCH_FILE := $(ROOT_DIR)/make/3rdparty/osgearth-$(OSGEARTH_VERSION).patch +OSGEARTH_PATCH_FILE := $(ROOT_DIR)/make/3rdparty/osgearth/osgearth-$(OSGEARTH_VERSION).patch .PHONY: osgearth osgearth: