[Commits] [SCM] claws-win32-installer branch, master, updated. 3.19.0-1-1-g3176437

[thorsten at claws-mail.org]

The branch, master has been updated
       via  317643716020af44700bdedf5183250812ff19d8 (commit)
      from  3986dd900377a9065539c0764c93f49309b46666 (commit)

Summary of changes:
 src/claws-mail.mk.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


- Log -----------------------------------------------------------------
commit 317643716020af44700bdedf5183250812ff19d8
Author: Thorsten Maerz <info at netztorte.de>
Date:   Wed Apr 6 09:11:17 2022 +0200

    Avoid stow conflicts (for "share/info/dir")
    
    If the package "install-info" is installed on the build system,
    stow will run into conflicts, because multiple packages install the
    "dir" file into the same location.

diff --git a/src/claws-mail.mk.in b/src/claws-mail.mk.in
index de3e242..099fd2d 100644
--- a/src/claws-mail.mk.in
+++ b/src/claws-mail.mk.in
@@ -177,7 +177,7 @@ stamps/stamp-$(1)-04-install: stamps/stamp-$(1)-03-make
 	touch stamps/stamp-$(1)-04-install
 
 stamps/stamp-$(1)-05-stow: stamps/stamp-$(1)-04-install
-	$(STOW) --dir=$(ipdir) $(pkg_ver)
+	$(STOW) --ignore='share/info/dir' --dir=$(ipdir) $(pkg_ver)
 	touch stamps/stamp-$(1)-05-stow
 
 stamps/stamp-final-$(1): stamps/stamp-$(1)-05-stow
@@ -237,7 +237,7 @@ stamps/stamp-$(1)-04-install: stamps/stamp-$(1)-03-make
 	touch stamps/stamp-$(1)-04-install
 
 stamps/stamp-$(1)-05-stow: stamps/stamp-$(1)-04-install
-	$(STOW) --dir=$(ipdir) $(pkg_ver)
+	$(STOW) --ignore='share/info/dir' --dir=$(ipdir) $(pkg_ver)
 	touch stamps/stamp-$(1)-05-stow
 
 stamps/stamp-final-$(1): stamps/stamp-$(1)-05-stow
@@ -263,7 +263,7 @@ stamps/stamp-$(1)-00-install: stamps/stamp-directories $(call GETDEPS,$(1))
 	touch stamps/stamp-$(1)-00-install
 
 stamps/stamp-$(1)-01-stow: stamps/stamp-$(1)-00-install
-	$(STOW) --dir=$(ipdir) $(pkg_ver)
+	$(STOW) --ignore='share/info/dir' --dir=$(ipdir) $(pkg_ver)
 	touch stamps/stamp-$(1)-01-stow
 
 stamps/stamp-final-$(1): stamps/stamp-$(1)-01-stow

-----------------------------------------------------------------------


hooks/post-receive
-- 
Installer sources for Claws Mail Windows port