From 0a461d7beafe926fb43b15092ea79d1c81c41dd5 Mon Sep 17 00:00:00 2001
From: Andreas Huggel <ahuggel@gmx.net>
Date: Sun, 1 Dec 2013 15:45:29 +0000
Subject: [PATCH] Updated build scripts for changes in the directory structure
 and to run on Ubuntu.

---
 website/bin/exiv2-buildrelease.sh | 7 ++++---
 website/bin/exiv2-buildwinexe.sh  | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/website/bin/exiv2-buildrelease.sh b/website/bin/exiv2-buildrelease.sh
index d0b82a63..5e9263c0 100755
--- a/website/bin/exiv2-buildrelease.sh
+++ b/website/bin/exiv2-buildrelease.sh
@@ -35,7 +35,7 @@ cd exiv2-$rel
 make config
 ./configure --disable-shared
 make -j3
-make install
+sudo make install
 make samples
 make doc
 cd test
@@ -49,7 +49,8 @@ make distclean
 rm -f Makefile
 rm -f bootstrap.linux
 rm -f msvc64\\runner.txt
-find . -type f -name '*[Cc][Mm][Aa][Kk][Ee]*' | xargs rm -f
+# 01-Dec-2013, ahu: Include CMake files in the distribution
+#find . -type f -name '*[Cc][Mm][Aa][Kk][Ee]*' | xargs rm -f
 rm -rf xmpsdk/src/.libs
 
 # Create source and doc packages
@@ -63,7 +64,7 @@ rm -rf exiv2-$rel
 tar zxvf exiv2-$rel.tar.gz
 cd exiv2-$rel
 ./configure
-make -j3
+make -j5
 make install
 make samples
 echo Exporting tests, this may take a while...
diff --git a/website/bin/exiv2-buildwinexe.sh b/website/bin/exiv2-buildwinexe.sh
index 43ee48bc..f2140d83 100755
--- a/website/bin/exiv2-buildwinexe.sh
+++ b/website/bin/exiv2-buildwinexe.sh
@@ -27,11 +27,11 @@ make -j3
 
 # Prepare package
 cd src
-rel=`grep EXV_PACKAGE_VERSION ../msvc/include/exv_msvc.h | sed 's/.*"\(.*\)"/\1/'`
+rel=`grep EXV_PACKAGE_VERSION ../msvc2012/include/exv_msvc.h | sed 's/.*"\(.*\)"/\1/'`
 tmpdir=exiv2-$rel-win
 rm -rf $tmpdir
 mkdir $tmpdir
-cp exiv2 $tmpdir/exiv2.exe
+cp ../bin/exiv2 $tmpdir/exiv2.exe
 cd $tmpdir
 strip exiv2.exe
 cp ../../doc/cmd.txt .