Merge pull request #723 from TheBlueMatt/gitianfix

Fix #722.

diff --combined contrib/gitian-descriptors/gitian.yml
index 6f503ac,d0f8dec..903a9dc
--- 1/contrib/gitian-descriptors/gitian.yml
--- 2/contrib/gitian-descriptors/gitian.yml
+++ b/contrib/gitian-descriptors/gitian.yml
@@@ -16,7 -16,6 +16,7 @@@ packages
  - "libssl-dev"
  - "git-core"
  - "unzip"
 +- "qrencode"
  reference_datetime: "2011-01-30 00:00:00"
  remotes:
  - "url": "https://github.com/bitcoin/bitcoin.git"
@@@ -40,7 -39,7 +40,7 @@@ script: 
    cp $OUTDIR/src/COPYING $OUTDIR
    cd src
    sed 's/$(DEBUGFLAGS)//' -i makefile.unix
-   make -f makefile.unix STATIC=1 DEFS="-I$INSTDIR/include -L$INSTDIR/lib" $MAKEOPTS bitcoind USE_UPNP=0 USE_SSL=1
+   make -f makefile.unix STATIC=1 OPENSSL_INCLUDE_PATH="$INSTDIR/include" OPENSSL_LIB_PATH="$INSTDIR/lib" $MAKEOPTS bitcoind USE_UPNP=0 USE_SSL=1
    mkdir -p $OUTDIR/bin/$GBUILD_BITS
    install -s bitcoind $OUTDIR/bin/$GBUILD_BITS
    cd ..