aboutsummaryrefslogtreecommitdiff
path: root/contrib/gitian-descriptors/gitian-osx.yml
diff options
context:
space:
mode:
authorCory Fields <cory-nospam-@coryfields.com>2016-06-07 14:51:51 -0400
committerCory Fields <cory-nospam-@coryfields.com>2016-06-07 22:11:43 -0400
commitad38204e6e114d383af0f17b18c216cae10d7686 (patch)
tree57ed46c71337e75031f69a288c607e600b0c8451 /contrib/gitian-descriptors/gitian-osx.yml
parentb676f38791edd4a276f7c7937ffdd98c0cd2cf08 (diff)
gitian: use CONFIG_SITE rather than hijacking the prefix
Diffstat (limited to 'contrib/gitian-descriptors/gitian-osx.yml')
-rw-r--r--contrib/gitian-descriptors/gitian-osx.yml6
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml
index c430932f9d..b37b35d76b 100644
--- a/contrib/gitian-descriptors/gitian-osx.yml
+++ b/contrib/gitian-descriptors/gitian-osx.yml
@@ -90,7 +90,7 @@ script: |
# Create the release tarball using (arbitrarily) the first host
./autogen.sh
- ./configure --prefix=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`
+ CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/
make dist
SOURCEDIST=`echo bitcoin-*.tar.gz`
DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'`
@@ -112,9 +112,9 @@ script: |
mkdir -p ${INSTALLPATH}
tar --strip-components=1 -xf ../$SOURCEDIST
- ./configure --prefix=${BASEPREFIX}/${i} --bindir=${INSTALLPATH}/bin --includedir=${INSTALLPATH}/include --libdir=${INSTALLPATH}/lib --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS}
+ CONFIG_SITE=${BASEPREFIX}/${i}/share/config.site ./configure --prefix=/ --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS}
make ${MAKEOPTS}
- make install-strip
+ make install-strip DESTDIR=${INSTALLPATH}
make osx_volname
make deploydir