[banshee] build: fix out-of-tree builds (when srcdir != builddir)



commit 6a62820f7df88524dcf472fec8e0acb1e38af5b2
Author: Andrés G. Aragoneses <knocte gmail com>
Date:   Mon Aug 10 14:54:29 2015 +0200

    build: fix out-of-tree builds (when srcdir != builddir)

 autogen.sh          |    5 ++++-
 build/build.dist.mk |    2 +-
 data/Makefile.am    |    4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index 0aec574..9f8aeed 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -53,6 +53,8 @@ test -z "$srcdir" && srcdir=.
        error "Directory \"$srcdir\" does not look like the top-level $PROJECT directory"
 }
 
+builddir=`pwd`
+cd "$srcdir"
 
 # in case there are binaries from a previous compilation
 make distclean 2>/dev/null
@@ -94,6 +96,7 @@ if [ $# = 0 ]; then
        echo "WARNING: I am going to run configure without any arguments."
 fi
 
+cd "$builddir"
 
 { cat <<EOF
 #!/usr/bin/env bash
@@ -102,4 +105,4 @@ EOF
 } > reautogen.sh
 chmod +x reautogen.sh
 
-run ./configure $@
+run "$srcdir/configure" $@
diff --git a/build/build.dist.mk b/build/build.dist.mk
index d9be83d..33b0ca8 100644
--- a/build/build.dist.mk
+++ b/build/build.dist.mk
@@ -1,5 +1,5 @@
 SOURCES_BUILD = $(addprefix $(srcdir)/, $(SOURCES))
-SOURCES_BUILD += $(top_srcdir)/src/AssemblyInfo.cs
+SOURCES_BUILD += $(top_builddir)/src/AssemblyInfo.cs
 
 RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
 RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
diff --git a/data/Makefile.am b/data/Makefile.am
index 6ba2fe3..486db9e 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -12,9 +12,9 @@ dbusservice_DATA = $(dbusservice_in_files:.service.in=.service)
 # Generate a fake source file containing strings for
 # translation that are found in our .addin.xml files
 ADDIN_XML_FILES = $(shell find $(top_srcdir)/src -name \*.addin.xml | grep -v /obj/)
-addin-xml-strings.cs: $(ADDIN_XML_FILES) $(top_srcdir)/build/addin-xml-string-extractor.exe
+addin-xml-strings.cs: $(ADDIN_XML_FILES) $(top_builddir)/build/addin-xml-string-extractor.exe
        @echo "  GEN   $@"
-       $(MONO) $(top_srcdir)/build/addin-xml-string-extractor.exe $(ADDIN_XML_FILES) > $@
+       $(MONO) $(top_builddir)/build/addin-xml-string-extractor.exe $(ADDIN_XML_FILES) > $@
 
 @INTLTOOL_XML_RULE@
 appdatadir = $(datadir)/appdata


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]