[Pkg-libvirt-commits] [libguestfs] 72/72: Made golang patch more robust (Closes: #780590)

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to branch master
in repository libguestfs.

commit 4164e0370e45788ad2d5aca464dd0e0949fd2e12
Author: Hilko Bengen <bengen at debian.org>
Date:   Sun Apr 5 17:18:22 2015 +0200

    Made golang patch more robust (Closes: #780590)
---
 debian/patches/0002-golang-Fix-for-out-of-tree-builds.patch | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/patches/0002-golang-Fix-for-out-of-tree-builds.patch b/debian/patches/0002-golang-Fix-for-out-of-tree-builds.patch
index c6aadce..eea10ed 100644
--- a/debian/patches/0002-golang-Fix-for-out-of-tree-builds.patch
+++ b/debian/patches/0002-golang-Fix-for-out-of-tree-builds.patch
@@ -3,22 +3,23 @@ Date: Thu, 12 Dec 2013 21:06:22 +0100
 Subject: golang: Fix for out-of-tree builds
 
 ---
- golang/Makefile.am | 2 ++
- 1 file changed, 2 insertions(+)
+ golang/Makefile.am | 3 +++
+ 1 file changed, 3 insertions(+)
 
 diff --git a/golang/Makefile.am b/golang/Makefile.am
-index 58cafc6..ba13691 100644
+index 58cafc6..0f09041 100644
 --- a/golang/Makefile.am
 +++ b/golang/Makefile.am
-@@ -49,6 +49,7 @@ golangpkg_DATA = \
+@@ -49,6 +49,8 @@ golangpkg_DATA = \
  	pkg/$(GOOS)_$(GOARCH)/$(pkg).a
  
  pkg/$(GOOS)_$(GOARCH)/$(pkg).a: src/$(pkg)/guestfs.go
-+	-[ $(srcdir) != $(builddir) ] && ln -s $(abs_srcdir)/src $(builddir)/src
++	-[ $(srcdir) != $(builddir) ] && \
++		[ ! -e $(builddir)/src ] && ln -s $(abs_srcdir)/src $(builddir)/src
  	$(top_builddir)/run $(GOLANG) install $(pkg)
  
  golangsrc_DATA = $(source_files)
-@@ -62,4 +63,5 @@ endif
+@@ -62,4 +64,5 @@ endif
  CLEANFILES = *~ src/$(pkg)/*~
  
  clean-local:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git