[Libreoffice-commits] .: 2 commits - solenv/gbuild

[Libreoffice Gerrit user]

 solenv/gbuild/InstallModuleTarget.mk |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 8d08ebb6c639cb419c97ae745ce626eee1bd4601
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Sep 26 18:03:33 2012 +0200

    drop 'private' from variable defs.
    
    Apparently make 3.81 is confused by using private target-specific
    simply-expanded variable (i.e., initialized with ':='), which in this
    case leads to
    
    /<builddir>/scp2/InstallModule_accessories.mk:30: *** multiple target patterns.  Stop.
    
    Recursively-expanded variable works fine....
    
    Anyway, it was just an idea. It seems the time is not ripe for it yet.
    
    Change-Id: Ic5582d809530256cad087c3c4fd10f9641d24cbd

diff --git a/solenv/gbuild/InstallModuleTarget.mk b/solenv/gbuild/InstallModuleTarget.mk
index 6ba3b46..822c5d5 100644
--- a/solenv/gbuild/InstallModuleTarget.mk
+++ b/solenv/gbuild/InstallModuleTarget.mk
@@ -105,7 +105,7 @@ $(call gb_ScpPreprocessTarget_get_clean_target,%) :
 
 # gb_ScpPreprocessTarget_ScpPreprocessTarget(<target>)
 define gb_ScpPreprocessTarget_ScpPreprocessTarget
-$(call gb_ScpPreprocessTarget_get_target,$(1)) : private SCP_SOURCE := $(call gb_ScpPreprocessTarget_get_source,$(1))
+$(call gb_ScpPreprocessTarget_get_target,$(1)) : SCP_SOURCE := $(call gb_ScpPreprocessTarget_get_source,$(1))
 $(call gb_ScpPreprocessTarget_get_target,$(1)) : $(call gb_ScpPreprocessTarget_get_source,$(1))
 $(call gb_ScpPreprocessTarget_get_target,$(1)) :| $(dir $(call gb_ScpPreprocessTarget_get_target,$(1))).dir
 
@@ -138,7 +138,7 @@ $(call gb_ScpMergeTarget_get_clean_target,%) :
 
 # gb_ScpMergeTarget_ScpMergeTarget(<target>)
 define gb_ScpMergeTarget_ScpMergeTarget
-$(call gb_ScpMergeTarget_get_target,$(1)) : private SCP_SOURCE := $(call gb_ScpMergeTarget_get_source,$(1))
+$(call gb_ScpMergeTarget_get_target,$(1)) : SCP_SOURCE := $(call gb_ScpMergeTarget_get_source,$(1))
 $(call gb_ScpMergeTarget_get_target,$(1)) : $(call gb_ScpMergeTarget_get_source,$(1))
 $(call gb_ScpMergeTarget_get_target,$(1)) :| $(dir $(call gb_ScpMergeTarget_get_target,$(1))).dir
 $(call gb_ScpMergeTarget_get_target,$(1)) : SCP_SDF := $(gb_SDFLOCATION)/$(dir $(1))localize.sdf
commit b411b87ebf8f8590254527d01f30a878745de76e
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Sep 26 17:58:52 2012 +0200

    avoid // in path
    
    Change-Id: I3ecd3393ab55c0aadca7432e26f84e69b6a9125c

diff --git a/solenv/gbuild/InstallModuleTarget.mk b/solenv/gbuild/InstallModuleTarget.mk
index b008bdd..6ba3b46 100644
--- a/solenv/gbuild/InstallModuleTarget.mk
+++ b/solenv/gbuild/InstallModuleTarget.mk
@@ -141,8 +141,8 @@ define gb_ScpMergeTarget_ScpMergeTarget
 $(call gb_ScpMergeTarget_get_target,$(1)) : private SCP_SOURCE := $(call gb_ScpMergeTarget_get_source,$(1))
 $(call gb_ScpMergeTarget_get_target,$(1)) : $(call gb_ScpMergeTarget_get_source,$(1))
 $(call gb_ScpMergeTarget_get_target,$(1)) :| $(dir $(call gb_ScpMergeTarget_get_target,$(1))).dir
-$(call gb_ScpMergeTarget_get_target,$(1)) : SCP_SDF := $(gb_SDFLOCATION)/$(dir $(1))/localize.sdf
-$(call gb_ScpMergeTarget_get_target,$(1)) : $(gb_SDFLOCATION)/$(dir $(1))/localize.sdf
+$(call gb_ScpMergeTarget_get_target,$(1)) : SCP_SDF := $(gb_SDFLOCATION)/$(dir $(1))localize.sdf
+$(call gb_ScpMergeTarget_get_target,$(1)) : $(gb_SDFLOCATION)/$(dir $(1))localize.sdf
 
 endef