From 9f7f50f1625ea390f456974d04a8034fb2bd1925 Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Sun, 29 Nov 2009 13:06:48 +0000 Subject: [PATCH] 2009-11-29 14:06 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/harbour-win-spec * harbour/harbour-wce-spec * harbour/mpkg_rpm_win.sh * harbour/mpkg_rpm_wce.sh * removed all conditional build settings - they are not necessary for current make system --- harbour/ChangeLog | 8 ++++++++ harbour/harbour-wce-spec | 14 -------------- harbour/harbour-win-spec | 14 -------------- harbour/mpkg_rpm_wce.sh | 16 ---------------- harbour/mpkg_rpm_win.sh | 16 ---------------- 5 files changed, 8 insertions(+), 60 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 2cdbc5684b..0570dfd752 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,14 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-11-29 14:06 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/harbour-win-spec + * harbour/harbour-wce-spec + * harbour/mpkg_rpm_win.sh + * harbour/mpkg_rpm_wce.sh + * removed all conditional build settings - they are not necessary + for current make system + 2009-11-29 13:49 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * harbour.spec * harbour-win-spec diff --git a/harbour/harbour-wce-spec b/harbour/harbour-wce-spec index 9d28036a78..1b3359ec25 100644 --- a/harbour/harbour-wce-spec +++ b/harbour/harbour-wce-spec @@ -9,16 +9,6 @@ # See COPYING for licensing terms. # --------------------------------------------------------------- -###################################################################### -# Conditional build: -# --with mysql - build mysql lib -# --with pgsql - build pgsql lib -# --with gd - build gd lib -# --with allegro - build gtalleg - Allegro based GT driver -# --with ads - build rddads -# --with odbc - build odbc lib -###################################################################### - ###################################################################### ## Definitions. ###################################################################### @@ -135,10 +125,6 @@ mkdir -p $HB_BIN_INSTALL make install %{?_smp_mflags} -[ "%{?_with_odbc:1}" ] || rm -f $HB_LIB_INSTALL/libhbodbc.a -[ "%{?_with_allegro:1}" ] || rm -f $HB_LIB_INSTALL/libgtalleg.a -[ "%{?_with_ads:1}" ] || rm -f $HB_LIB_INSTALL/librddads.a - # remove unused files rm -fR ${HB_BIN_INSTALL}/{harbour,hbpp,hbmk2,hbrun,hbi18n,hbtest}.exe diff --git a/harbour/harbour-win-spec b/harbour/harbour-win-spec index 227996714b..05509d16ce 100644 --- a/harbour/harbour-win-spec +++ b/harbour/harbour-win-spec @@ -9,16 +9,6 @@ # See COPYING for licensing terms. # --------------------------------------------------------------- -###################################################################### -# Conditional build: -# --with mysql - build mysql lib -# --with pgsql - build pgsql lib -# --with gd - build gd lib -# --with allegro - build gtalleg - Allegro based GT driver -# --with ads - build rddads -# --with odbc - build odbc lib -###################################################################### - ###################################################################### ## Definitions. ###################################################################### @@ -135,10 +125,6 @@ mkdir -p $HB_BIN_INSTALL make install %{?_smp_mflags} -[ "%{?_with_odbc:1}" ] || rm -f $HB_LIB_INSTALL/libhbodbc.a -[ "%{?_with_allegro:1}" ] || rm -f $HB_LIB_INSTALL/libgtalleg.a -[ "%{?_with_ads:1}" ] || rm -f $HB_LIB_INSTALL/librddads.a - # remove unused files rm -fR ${HB_BIN_INSTALL}/{harbour,hbpp,hbmk2,hbrun,hbi18n,hbtest}.exe diff --git a/harbour/mpkg_rpm_wce.sh b/harbour/mpkg_rpm_wce.sh index fa0e33a500..f1267215d6 100755 --- a/harbour/mpkg_rpm_wce.sh +++ b/harbour/mpkg_rpm_wce.sh @@ -11,16 +11,6 @@ # See COPYING for licensing terms. # --------------------------------------------------------------- -###################################################################### -# Conditional build: -# --with mysql - build mysql lib -# --with pgsql - build pgsql lib -# --with gd - build gd lib -# --with allegro - build GTALLEG - Allegro based GT driver -# --with ads - build ADS RDD -# --without odbc - do not build odbc lib -###################################################################### - test_reqrpm() { rpm -q --whatprovides "$1" &> /dev/null @@ -69,12 +59,6 @@ do shift done -if [ -f /usr/local/ads/acesdk/ace.h ] || \ - [ -f ${HOME}/ads/acesdk/ace.h ] -then - INST_PARAM="${INST_PARAM} --with ads" -fi - TOINST_LST="" for i in ${NEED_RPM} do diff --git a/harbour/mpkg_rpm_win.sh b/harbour/mpkg_rpm_win.sh index af602b75e3..b6cf8f281b 100755 --- a/harbour/mpkg_rpm_win.sh +++ b/harbour/mpkg_rpm_win.sh @@ -11,16 +11,6 @@ # See COPYING for licensing terms. # --------------------------------------------------------------- -###################################################################### -# Conditional build: -# --with mysql - build mysql lib -# --with pgsql - build pgsql lib -# --with gd - build gd lib -# --with allegro - build GTALLEG - Allegro based GT driver -# --with ads - build ADS RDD -# --without odbc - do not build odbc lib -###################################################################### - test_reqrpm() { rpm -q --whatprovides "$1" &> /dev/null @@ -91,12 +81,6 @@ do shift done -if [ -f /usr/local/ads/acesdk/ace.h ] || \ - [ -f ${HOME}/ads/acesdk/ace.h ] -then - INST_PARAM="${INST_PARAM} --with ads" -fi - TOINST_LST="" for i in ${NEED_RPM} do