From 741bcba2dad5551e4de00e6058b6daf4e7b3d803 Mon Sep 17 00:00:00 2001
From: Andraž Levstik
Date: Tue, 17 Apr 2007 20:28:51 +0200
Subject: gnustep-addressbook: minor fixes

---
 gnustep-apps/gnustep-addressbook/CONFIGURE |  2 --
 gnustep-apps/gnustep-addressbook/DEPENDS   |  3 ++-
 gnustep-apps/gnustep-addressbook/HISTORY   |  6 ++++++
 gnustep-apps/gnustep-addressbook/INSTALL   | 23 -----------------------
 gnustep-apps/gnustep-addressbook/PRE_BUILD | 12 ++++++++++++
 5 files changed, 20 insertions(+), 26 deletions(-)
 delete mode 100755 gnustep-apps/gnustep-addressbook/CONFIGURE
 delete mode 100755 gnustep-apps/gnustep-addressbook/INSTALL
 create mode 100755 gnustep-apps/gnustep-addressbook/PRE_BUILD

(limited to 'gnustep-apps/gnustep-addressbook')

diff --git a/gnustep-apps/gnustep-addressbook/CONFIGURE b/gnustep-apps/gnustep-addressbook/CONFIGURE
deleted file mode 100755
index a7ddedc751..0000000000
--- a/gnustep-apps/gnustep-addressbook/CONFIGURE
+++ /dev/null
@@ -1,2 +0,0 @@
-config_query ADSRV "Build adserver?"  y
-config_query ADTOL "Build adtool?"    y
diff --git a/gnustep-apps/gnustep-addressbook/DEPENDS b/gnustep-apps/gnustep-addressbook/DEPENDS
index e9ad78b2d2..cd6da9897f 100755
--- a/gnustep-apps/gnustep-addressbook/DEPENDS
+++ b/gnustep-apps/gnustep-addressbook/DEPENDS
@@ -1 +1,2 @@
-depends gnustep-gui
+depends gnustep-gui  &&
+depends gnustep-make
diff --git a/gnustep-apps/gnustep-addressbook/HISTORY b/gnustep-apps/gnustep-addressbook/HISTORY
index 3a7a086a80..b1d8bf58aa 100644
--- a/gnustep-apps/gnustep-addressbook/HISTORY
+++ b/gnustep-apps/gnustep-addressbook/HISTORY
@@ -1,3 +1,9 @@
+2007-04-17 Andraž "ruskie" Levstik <ruskie@mages.ath.cx>
+	* DEPENDS: missing depends
+	* CONFIGURE: dropped gonna separate goodies into own spell
+	* INSTALL: dropped
+	* PRE_BUILD: added to fix install paths
+
 2006-10-03 Juuso Alasuutari <iuso@sourcemage.org>
 	* DETAILS: [automated] Removed UPDATED.
 
diff --git a/gnustep-apps/gnustep-addressbook/INSTALL b/gnustep-apps/gnustep-addressbook/INSTALL
deleted file mode 100755
index c178813d29..0000000000
--- a/gnustep-apps/gnustep-addressbook/INSTALL
+++ /dev/null
@@ -1,23 +0,0 @@
-export TAR_OPTIONS="--no-same-owner"
-
-make_single                                                           &&
-make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install            &&
-
-if [ "$ADSRV" == "y" ];
-then
-    cd Goodies/adserver                                               &&
-    make                                                              &&
-    make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install        &&
-    cd ../../
-fi                                                                    &&
-
-
-if [ "$ADTOL" == "y" ];
-then
-    cd Goodies/adtool                                                 &&
-    make                                                              &&
-    make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install        &&
-    cd ../../
-fi                                                                    &&
-
-make_normal
diff --git a/gnustep-apps/gnustep-addressbook/PRE_BUILD b/gnustep-apps/gnustep-addressbook/PRE_BUILD
new file mode 100755
index 0000000000..867802eb25
--- /dev/null
+++ b/gnustep-apps/gnustep-addressbook/PRE_BUILD
@@ -0,0 +1,12 @@
+default_pre_build     &&
+cd $SOURCE_DIRECTORY  &&
+sedit 's/GNUSTEP_INSTALLATION_DIR)\/Library\/Headers/GNUSTEP_SYSTEM_HEADERS)/g' Frameworks/Addresses/GNUmakefile  &&
+sedit 's/GNUSTEP_INSTALLATION_DIR)\/Library/GNUSTEP_SYSTEM_LIBRARY)/g' Goodies/VCFViewer/GNUmakefile  &&
+local gnumakefile
+for gnumakefile in AddressManager/GNUmakefile \
+                   Goodies/adtool/GNUmakefile \
+                   Goodies/adserver/GNUmakefile \
+                   Test/GNUmakefile
+do
+sedit 's/Versions\/A/Versions\/Current/g' $gnumakefile
+done
-- 
cgit v1.2.3