From ff1f612d70ffdfe8230841dcdfed0a80e11e77c0 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sun, 20 Jul 2008 18:26:08 +0000 Subject: [PATCH] Update git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/branches/Branch-2.4@7406 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/LICENSE | 2 +- bacula/src/win32/build-depkgs-mingw32 | 104 +++++++++++++------------- 2 files changed, 53 insertions(+), 53 deletions(-) diff --git a/bacula/LICENSE b/bacula/LICENSE index d39557cb6c..67be75373b 100644 --- a/bacula/LICENSE +++ b/bacula/LICENSE @@ -77,7 +77,7 @@ Code falling under the above conditions will be marked as follows: Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - Bacula® is a registered trademark of John Walker. + Bacula® is a registered trademark ofKern Sibbald. The licensor of Bacula is the Free Software Foundation Europe (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich, Switzerland, email:ftf@fsfeurope.org. diff --git a/bacula/src/win32/build-depkgs-mingw32 b/bacula/src/win32/build-depkgs-mingw32 index 74a3f5af72..c251e1e8bd 100755 --- a/bacula/src/win32/build-depkgs-mingw32 +++ b/bacula/src/win32/build-depkgs-mingw32 @@ -393,70 +393,70 @@ process_nsis() process_mtx() { - if get_source "${URL_MTX}" "${DIR_MTX}" "${MKD_MTX}" - then - echo Patching mtx - # We can't run configure in a cross-compile environment so we - # patch the files to the correct values - cp -f config.h.in config.h - cp -f Makefile.in Makefile - rm -f configure - >patch.log - do_patch mtx.patch - fi - echo Building mtx - do_make Makefile prefix=${DEPPKG_DIR} all - echo Installing mtx - do_make Makefile prefix=${DEPPKG_DIR} install + if get_source "${URL_MTX}" "${DIR_MTX}" "${MKD_MTX}" + then + echo Patching mtx + # We can't run configure in a cross-compile environment so we + # patch the files to the correct values + cp -f config.h.in config.h + cp -f Makefile.in Makefile + rm -f configure + >patch.log + do_patch mtx.patch + fi + echo Building mtx + do_make Makefile prefix=${DEPPKG_DIR} all + echo Installing mtx + do_make Makefile prefix=${DEPPKG_DIR} install } process_mt() { - if get_source "${URL_MT}" "${DIR_MT}" "${MKD_MT}" - then - echo "Patching mt" - >patch.log - do_patch mt.patch - fi - echo "Building mt" - do_make Makefile PREFIX=${DEPPKG_DIR} all - echo Installing mt - do_make Makefile PREFIX=${DEPPKG_DIR} install + if get_source "${URL_MT}" "${DIR_MT}" "${MKD_MT}" + then + echo "Patching mt" + >patch.log + do_patch mt.patch + fi + echo "Building mt" + do_make Makefile PREFIX=${DEPPKG_DIR} all + echo Installing mt + do_make Makefile PREFIX=${DEPPKG_DIR} install } process_sed() { - if get_source "${URL_SED}" "${DIR_SED}" "${MKD_SED}" - then - echo Patching sed - >patch.log - do_patch sed.patch - echo Configuring sed - ./configure --host=mingw32 \ - --prefix=${DEPPKG_DIR} \ - --disable-nls >make.log 2>&1 - fi - echo Building sed - do_make Makefile all - echo Installing sed - do_make Makefile install + if get_source "${URL_SED}" "${DIR_SED}" "${MKD_SED}" + then + echo Patching sed + >patch.log + do_patch sed.patch + echo Configuring sed + ./configure --host=mingw32 \ + --prefix=${DEPPKG_DIR} \ + --disable-nls >make.log 2>&1 + fi + echo Building sed + do_make Makefile all + echo Installing sed + do_make Makefile install } process_stab2cv() { - if get_source "${URL_STAB2CV}" "${DIR_STAB2CV}" "${MKD_STAB2CV}" - then - # echo Patching stab2cv - # >patch.log - # do_patch stab2cv.patch - echo Configuring stab2cv - ./configure --prefix=${DEPPKG_DIR}/tools \ - >make.log 2>&1 - fi - echo Building stab2cv - do_make Makefile - echo Installing stab2cv - do_make Makefile install + if get_source "${URL_STAB2CV}" "${DIR_STAB2CV}" "${MKD_STAB2CV}" + then + # echo Patching stab2cv + # >patch.log + # do_patch stab2cv.patch + echo Configuring stab2cv + ./configure --prefix=${DEPPKG_DIR}/tools \ + >make.log 2>&1 + fi + echo Building stab2cv + do_make Makefile + echo Installing stab2cv + do_make Makefile install } process_cmd_utils() -- 2.39.2