diff options
| author | Andraž Levstik | 2007-04-20 22:04:23 +0200 |
|---|---|---|
| committer | Andraž Levstik | 2007-04-20 22:04:23 +0200 |
| commit | 36312d591d0b4ab244efad90281fd0713bc9650b (patch) | |
| tree | e4a892cf0f8efc82ccfe34b95d4d2e6d1caf46ab /gnustep-libs/FUNCTIONS | |
| parent | c73b01d6eb546ceae406feb44fff108c78fba7e0 (diff) | |
gnustep-libs/FUNCTIONS: minor fixups
Diffstat (limited to 'gnustep-libs/FUNCTIONS')
| -rwxr-xr-x | gnustep-libs/FUNCTIONS | 58 |
1 files changed, 19 insertions, 39 deletions
diff --git a/gnustep-libs/FUNCTIONS b/gnustep-libs/FUNCTIONS index 018209b586..05eecd02a4 100755 --- a/gnustep-libs/FUNCTIONS +++ b/gnustep-libs/FUNCTIONS @@ -1,45 +1,25 @@ -# ------------------------------------------------------------------------------ +#--- ## Replace sorcerys default_build with a custom one -# ------------------------------------------------------------------------------ -function default_build () +#--- +function default_build() { - if [ -f /etc/profile.d/GNUstep.sh ] - then - . /etc/profile.d/GNUstep.sh - else - message "${ERROR_COLOR}Unable to find /etc/profile.d/GNUstep.sh" && - message "Rebuild gnustep-make${DEFAULT_COLOR}" && - return 1 - fi && - - if [ -f ./configure ] - then - ./configure \ - $OPTS - fi && - - make && - - if [ "$GNUSTEP_BUILD_DOC" == "y" ] - then - cd Documentation && - make && - cd ../ - fi + if [[ -f ${TRACK_ROOT}/usr/share/GNUstep/Makefiles/GNUstep.sh ]] + then + . ${TRACK_ROOT}/usr/share/GNUstep/Makefiles/GNUstep.sh + fi + if [[ -x ./configure ]] + then + real_default_build + else + make $@ + fi } -# ------------------------------------------------------------------------------ -## Replace sorcerys default_install with a custom one -# ------------------------------------------------------------------------------ -function default_install () +function default_post_install() { - make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install && - - if [ "$GNUSTEP_BUILD_DOC" == "y" ] - then - cd Documentation && - make && - make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install && - cd ../ - fi + real_default_post_install + if [[ -x /usr/bin/make_services ]]; then + message "Running make_services" + /usr/bin/make_services + fi } |