diff options
author | Andraž Levstik | 2007-04-20 22:00:46 +0200 |
---|---|---|
committer | Andraž Levstik | 2007-04-20 22:00:46 +0200 |
commit | c4f9160d6c8a6e0f0e280fe17e3f38309426fcbd (patch) | |
tree | bd2497a62b61b22d8e98e479b72140361f3617ea /gnustep-apps | |
parent | 91d7128f43d4110b5816e727181e664f240632da (diff) |
gnustep-apps/FUNCTIONS: some fixes
Diffstat (limited to 'gnustep-apps')
-rwxr-xr-x | gnustep-apps/FUNCTIONS | 58 |
1 files changed, 19 insertions, 39 deletions
diff --git a/gnustep-apps/FUNCTIONS b/gnustep-apps/FUNCTIONS index 49fbfd1a84..05eecd02a4 100755 --- a/gnustep-apps/FUNCTIONS +++ b/gnustep-apps/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 } |