gnustep-preferences: minor fixups

6 files changed, 42 insertions, 25 deletions

diff --git a/gnustep-apps/gnustep-preferences/BUILD b/gnustep-apps/gnustep-preferences/BUILD
index 9e81f09548..fe17e0199e 100755
--- a/gnustep-apps/gnustep-preferences/BUILD
+++ b/gnustep-apps/gnustep-preferences/BUILD
@@ -1,14 +1,3 @@
-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                                                                    &&
-
-cd Applications/Preferences                                           &&
-
-make                                                                  &&
-
-cd ../../
+pushd Applications/Preferences   &&
+default_build                    &&
+popd
diff --git a/gnustep-apps/gnustep-preferences/DEPENDS b/gnustep-apps/gnustep-preferences/DEPENDS
index c403875ba2..1947e89d17 100755
--- a/gnustep-apps/gnustep-preferences/DEPENDS
+++ b/gnustep-apps/gnustep-preferences/DEPENDS
@@ -1 +1,3 @@
-depends gnustep-prefsmodule
+depends gnustep-prefsmodule  &&
+depends gnustep-make         &&
+depends gnustep-gui
diff --git a/gnustep-apps/gnustep-preferences/DETAILS b/gnustep-apps/gnustep-preferences/DETAILS
index 4fe86b2344..d4f84f4756 100755
--- a/gnustep-apps/gnustep-preferences/DETAILS
+++ b/gnustep-apps/gnustep-preferences/DETAILS
@@ -1,5 +1,5 @@
            SPELL=gnustep-preferences
-if [ "$PREFAPP_CVS_AUTOUPDATE" == "y" ];
+if [[ "$PREFAPP_CVS_AUTOUPDATE" == "y" ]];
 then
          VERSION=$(date +%Y%m%d)
 else
@@ -15,7 +15,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/Preferences-cvs
          ENTERED=20050908
         KEYWORDS="gnustep"
            SHORT="GNUstep preference settings interface."
-
 cat << EOF
 GNUstep preference settings interface.
 EOF
diff --git a/gnustep-apps/gnustep-preferences/HISTORY b/gnustep-apps/gnustep-preferences/HISTORY
index a9ceeca800..3fc12c82a1 100644
--- a/gnustep-apps/gnustep-preferences/HISTORY
+++ b/gnustep-apps/gnustep-preferences/HISTORY
@@ -1,3 +1,10 @@
+2007-04-18 Andraž "ruskie" Levstik <ruskie@mages.ath.cx>
+	* DETAILS: minor fixups
+	* DEPENDS: deps cleanup
+	* BUILD: updated
+	* INSTALL: updated
+	* PRE_BUILD: added to fixup some paths
+
 2006-10-03 Juuso Alasuutari <iuso@sourcemage.org>
 	* DETAILS: [automated] Removed UPDATED.
 
diff --git a/gnustep-apps/gnustep-preferences/INSTALL b/gnustep-apps/gnustep-preferences/INSTALL
index da55fe5431..9d553b8ea5 100755
--- a/gnustep-apps/gnustep-preferences/INSTALL
+++ b/gnustep-apps/gnustep-preferences/INSTALL
@@ -1,5 +1,4 @@
-export TAR_OPTIONS="--no-same-owner"
-
-cd Applications/Preferences                                &&
-make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install &&         
-cd ../../
+mkdir -vp ${INSTALL_ROOT}/usr/lib/GNUstep/Colors  &&
+pushd Applications/Preferences                    &&
+default_install                                   &&
+popd
diff --git a/gnustep-apps/gnustep-preferences/PRE_BUILD b/gnustep-apps/gnustep-preferences/PRE_BUILD
index f80b06369a..6519cfbf1c 100755
--- a/gnustep-apps/gnustep-preferences/PRE_BUILD
+++ b/gnustep-apps/gnustep-preferences/PRE_BUILD
@@ -1,3 +1,24 @@
-default_pre_build                   &&
-cd $SOURCE_DIRECTORY                &&
-rm -rf Applications/Preferences/CVS
+default_pre_build                                         &&
+cd $SOURCE_DIRECTORY/Applications/Preferences      &&
+local gnumakefile                                         &&
+for gnumakefile in GNUmakefile.preamble                   \
+                   Modules/Time/GNUmakefile               \
+                   Modules/Time/GNUmakefile.preamble      \
+                   Modules/Colors/GNUmakefile             \
+                   Modules/Colors/GNUmakefile.preamble    \
+                   Modules/Keyboard/GNUmakefile           \
+                   Modules/Keyboard/GNUmakefile.preamble  \
+                   Modules/Font/GNUmakefile               \
+                   Modules/Font/GNUmakefile.preamble      \
+                   Modules/Defaults/GNUmakefile           \
+                   Modules/Defaults/GNUmakefile.preamble
+
+do
+sedit 's/GNUSTEP_INSTALLATION_DIR)\/Library/GNUSTEP_SYSTEM_LIBRARY)/g' $gnumakefile  &&
+sedit 's/GNUSTEP_SYSTEM_ROOT/GNUSTEP_SYSTEM_LIBRARY/g' $gnumakefile
+done  &&
+sedit 's/GNUSTEP_SYSTEM_LIBRARY)\/Library/GNUSTEP_SYSTEM_LIBRARY)/g' GNUmakefile.preamble &&
+sedit 's/GNUSTEP_LOCAL_ROOT)\/Library/GNUSTEP_SYSTEM_LIBRARY)/g' GNUmakefile.preamble &&
+sedit 's/GNUSTEP_NETWORK_ROOT)\/Library/GNUSTEP_SYSTEM_LIBRARY)/g' GNUmakefile.preamble &&
+sedit 's/GNUSTEP_USER_ROOT)\/Library/GNUSTEP_SYSTEM_LIBRARY)/g' GNUmakefile.preamble
+