[Libreoffice-commits] .: solenv/inc

Fridrich Strba fridrich at kemper.freedesktop.org
Wed Mar 2 04:45:22 PST 2011


 solenv/inc/tg_ext.mk |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit e58193142baa26afb8eddb90e29f06b8c393e977
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Wed Mar 2 13:44:47 2011 +0100

    Revert "Trying to fix the rebuild of external library after failed build"
    
    This reverts commit 56ffe1d3c7080e9c59f6e66287a433905e80031c.
    
    This one did not have any beneficial effect, only breaking tinderboxes

diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk
index 4455b41..f15bd8f 100644
--- a/solenv/inc/tg_ext.mk
+++ b/solenv/inc/tg_ext.mk
@@ -236,8 +236,7 @@ $(PACKAGE_DIR)/$(BUILD_FLAG_FILE) : $(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE)
     $(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)/$(BUILD_FLAG_FILE)
 .ELSE			# "$(eq,x$(BUILD_ACTION:s/none//)x,xx true false)"=="true"
     $(COMMAND_ECHO)-$(MKDIR) $(P_BUILD_DIR)
-    $(COMMAND_ECHO)cd $(P_BUILD_DIR) && $(BUILD_ACTION) $(BUILD_FLAGS) && $(TOUCH) $(BUILD_FLAG_FILE)
-    $(COMMAND_ECHO)mv $(P_BUILD_DIR)/$(BUILD_FLAG_FILE) $(PACKAGE_DIR)/$(BUILD_FLAG_FILE)
+    $(COMMAND_ECHO)cd $(P_BUILD_DIR) && $(BUILD_ACTION) $(BUILD_FLAGS) && $(TOUCH) $(ABS_PACKAGE_DIR)/$(BUILD_FLAG_FILE)
 .ENDIF			# "$(eq,x$(BUILD_ACTION:s/none//)x,xx true false)"=="true"
 
 $(PACKAGE_DIR)/$(INSTALL_FLAG_FILE) : $(PACKAGE_DIR)/$(BUILD_FLAG_FILE)


More information about the Libreoffice-commits mailing list