diff options
| author | Jonathan Perkin <jonathan.perkin@oracle.com> | 2010-03-24 22:30:39 +0100 |
|---|---|---|
| committer | Jonathan Perkin <jonathan.perkin@oracle.com> | 2010-03-24 22:30:39 +0100 |
| commit | 29fd67ff4e1a67ad401b2a84d965796400ebbd31 (patch) | |
| tree | b423bd1a7605f1c8802a70cb4bed1d7398b60da7 /support-files | |
| parent | e7711a372a37c788e10380ae115922b69f435899 (diff) | |
| download | mariadb-git-29fd67ff4e1a67ad401b2a84d965796400ebbd31.tar.gz | |
Fix source layout.
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/mysql.spec.sh | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 68935eed9e4..e9bb79dbe9d 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -329,11 +329,7 @@ client/server version. ############################################################################## %prep -# We unpack the source two times, for 'debug' and 'release' build. -%setup -T -a 0 -c -n mysql-%{mysql_version} -mv mysql-%{mysql_version} mysql-debug-%{mysql_version} -%setup -D -T -a 0 -n mysql-%{mysql_version} -mv mysql-%{mysql_version} mysql-release-%{mysql_version} +%setup -T -a 0 -c -n %{src_dir} ############################################################################## %build @@ -376,7 +372,7 @@ mkdir debug -e 's/ -ip / /' \ -e 's/^ //' \ -e 's/ $//'` - ${CMAKE} .. -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \ + ${CMAKE} ../%{src_dir} -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \ -DCMAKE_BUILD_TYPE=Debug make VERBOSE=1 mysqld mysqlserver ) @@ -384,7 +380,7 @@ mkdir debug mkdir release ( cd release - ${CMAKE} .. -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM + ${CMAKE} ../%{src_dir} -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM make VERBOSE=1 ) |