[gtk/gtk-3-24] Try again to fix 'make dist'

[Chun-wei Fan <fanchunwei src gnome org>]

commit 7647208fba4915fff5423ed490a9f33ee24d819c
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Thu Dec 24 18:08:30 2020 +0800

    Try again to fix 'make dist'
    
    It turns out that we must put Directory.Build.props in win32/vs10 and let
    automake copy it over to win32/vs15/... so do that, and only dist the copy
    in win32/vs15.

 win32/Makefile-newvs.am                    | 4 +---
 win32/{vs15 => vs10}/Directory.Build.props | 0
 win32/vs15/Makefile.am                     | 9 +++++----
 3 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/win32/Makefile-newvs.am b/win32/Makefile-newvs.am
index 9cda120c7a..e5c7581288 100644
--- a/win32/Makefile-newvs.am
+++ b/win32/Makefile-newvs.am
@@ -41,10 +41,8 @@ endif
 %.props: $(top_builddir)/win32/vs10/Makefile
        if test -e $(top_srcdir)/win32/vs10/$@; then \
                sed 's/<VSVer>10<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' < $(top_srcdir)/win32/vs10/$@ > 
$(top_builddir)/win32/vs$(MSVC_VER)/$@; \
-       elif test -e $(top_builddir)/win32/vs10/$@; then \
-               sed 's/<VSVer>10<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' < $(top_builddir)/win32/vs10/$@ > 
$(top_builddir)/win32/vs$(MSVC_VER)/$@; \
        else \
-               : \
+               sed 's/<VSVer>10<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' < $(top_builddir)/win32/vs10/$@ > 
$(top_builddir)/win32/vs$(MSVC_VER)/$@; \
        fi
 
 %.vcxproj.filters: $(top_builddir)/win32/vs10/Makefile
diff --git a/win32/vs15/Directory.Build.props b/win32/vs10/Directory.Build.props
similarity index 100%
rename from win32/vs15/Directory.Build.props
rename to win32/vs10/Directory.Build.props
diff --git a/win32/vs15/Makefile.am b/win32/vs15/Makefile.am
index a921879d3e..f2838e8df3 100644
--- a/win32/vs15/Makefile.am
+++ b/win32/vs15/Makefile.am
@@ -1,6 +1,7 @@
 include $(top_srcdir)/Makefile.decl
 
-EXTRA_DIST_COPIED =    \
+EXTRA_DIST +=  \
+       Directory.Build.props   \
        README.txt      \
        gtk+.sln        \
        gtk3-prebuild.vcxproj   \
@@ -40,9 +41,7 @@ EXTRA_DIST_COPIED =   \
        gtk3-install.props      \
        gtk3-version-paths.props
 
-EXTRA_DIST += $(EXTRA_DIST_COPIED) Directory.build.props
-
-DISTCLEANFILES = $(EXTRA_DIST_COPIED)
+DISTCLEANFILES = $(EXTRA_DIST)
 
 MSVC_VER = 15
 MSVC_VER_LONG = 15
@@ -51,4 +50,6 @@ MSVC_FORMAT_VER = 12
 
 include $(top_srcdir)/win32/Makefile-newvs.am
 
+Directory.Build.props:
+
 -include $(top_srcdir)/git.mk