summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndraž Levstik2007-04-17 20:28:51 +0200
committerAndraž Levstik2007-04-17 20:28:51 +0200
commit741bcba2dad5551e4de00e6058b6daf4e7b3d803 (patch)
tree9e10bd52cebc6783cf031246e7fec87962fab0da
parentf0f15a7ced73de714503ef86e0cf7aa25254fbeb (diff)
gnustep-addressbook: minor fixes
-rwxr-xr-xgnustep-apps/gnustep-addressbook/CONFIGURE2
-rwxr-xr-xgnustep-apps/gnustep-addressbook/DEPENDS3
-rw-r--r--gnustep-apps/gnustep-addressbook/HISTORY6
-rwxr-xr-xgnustep-apps/gnustep-addressbook/INSTALL23
-rwxr-xr-xgnustep-apps/gnustep-addressbook/PRE_BUILD12
5 files changed, 20 insertions, 26 deletions
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