diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-04-20 14:54:28 +0100 |
|---|---|---|
| committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2015-04-29 15:25:51 +0800 |
| commit | fc914db11f05e5e5d88e1f341d8e75b561902bcc (patch) | |
| tree | f5527f689585d90960ce96694621df89a33581a1 | |
| parent | 44c48476393d031d16247c774f0d19cb9a359843 (diff) | |
| download | atk-fc914db11f05e5e5d88e1f341d8e75b561902bcc.tar.gz | |
Makefile-newvs: some .vcxproj.filters files are in builddir, some in srcdir
Without this change, out-of-tree distcheck doesn't get very far.
Similarly, allow *.vcxproj, *.props to be in either the builddir or
the srcdir.
Finally, since I'm touching these lines anyway, eliminate some
useless uses of cat: "cat x | sed 's/foo/bar/' > y" is
equivalent to "sed 's/foo/bar/' < x > y".
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=748176
Reviewed-by: Chun-wei Fan <fanchunwei@src.gnome.org>
| -rw-r--r-- | build/Makefile-newvs.am | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/build/Makefile-newvs.am b/build/Makefile-newvs.am index 9239b96..e3acd91 100644 --- a/build/Makefile-newvs.am +++ b/build/Makefile-newvs.am @@ -16,12 +16,22 @@ README.txt: $(top_srcdir)/build/win32/vs10/README.txt cat $< | sed 's/vs10/vs$(MSVC_VER)/g' | sed 's/VS10/VS$(MSVC_VER)/g' > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@ %.vcxproj: - cat $(top_builddir)/build/win32/vs10/$@ | sed 's/v100/v$(MSVC_VER)0/g' > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@ + if test -e $(top_srcdir)/build/win32/vs10/$@; then \ + sed 's/v100/v$(MSVC_VER)0/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ + else \ + sed 's/v100/v$(MSVC_VER)0/g' < $(top_builddir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ + fi %.props: - cat $(top_builddir)/build/win32/vs10/$@ | sed 's/<VSVer>10<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@ + if test -e $(top_srcdir)/build/win32/vs10/$@; then \ + sed 's/<VSVer>10<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ + else \ + sed 's/<VSVer>10<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' < $(top_builddir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ + fi %.vcxproj.filters: - cp $(top_builddir)/build/win32/vs10/$@ $(top_builddir)/build/win32/vs$(MSVC_VER)/$@ - - + if test -e $(top_srcdir)/build/win32/vs10/$@; then \ + cp $(top_srcdir)/build/win32/vs10/$@ $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ + else \ + cp $(top_builddir)/build/win32/vs10/$@ $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ + fi |