diff -Naur TalkSoup-1.0alpha.orig/InFilters/DCCSupport/GNUmakefile TalkSoup-1.0alpha/InFilters/DCCSupport/GNUmakefile
--- TalkSoup-1.0alpha.orig/InFilters/DCCSupport/GNUmakefile	2007-05-12 12:37:56.000000000 +0200
+++ TalkSoup-1.0alpha/InFilters/DCCSupport/GNUmakefile	2007-05-12 16:31:15.000000000 +0200
@@ -8,9 +8,9 @@
 endif
 
 ifeq ($(OBJC_RUNTIME_LIB), apple)
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Application\ Support/TalkSoup/InFilters
+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Application\ Support/TalkSoup/InFilters
 else
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/ApplicationSupport/TalkSoup/InFilters
+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/ApplicationSupport/TalkSoup/InFilters
 endif
 
 DCCSupport_OBJC_FILES = DCCSupport.m DCCObject.m DCCSender.m DCCGetter.m
diff -Naur TalkSoup-1.0alpha.orig/InFilters/Debold/GNUmakefile TalkSoup-1.0alpha/InFilters/Debold/GNUmakefile
--- TalkSoup-1.0alpha.orig/InFilters/Debold/GNUmakefile	2007-05-12 12:37:56.000000000 +0200
+++ TalkSoup-1.0alpha/InFilters/Debold/GNUmakefile	2007-05-12 16:31:53.000000000 +0200
@@ -4,9 +4,9 @@
 BUNDLE_EXTENSION =
 
 ifeq ($(OBJC_RUNTIME_LIB), apple)
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Application\ Support/TalkSoup/InFilters
+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Application\ Support/TalkSoup/InFilters
 else
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/ApplicationSupport/TalkSoup/InFilters
+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/ApplicationSupport/TalkSoup/InFilters
 endif
 
 Debold_LANGUAGES = English
diff -Naur TalkSoup-1.0alpha.orig/InFilters/Decolorizer/GNUmakefile TalkSoup-1.0alpha/InFilters/Decolorizer/GNUmakefile
--- TalkSoup-1.0alpha.orig/InFilters/Decolorizer/GNUmakefile	2007-05-12 12:37:56.000000000 +0200
+++ TalkSoup-1.0alpha/InFilters/Decolorizer/GNUmakefile	2007-05-12 16:31:53.000000000 +0200
@@ -4,9 +4,9 @@
 BUNDLE_EXTENSION =
 
 ifeq ($(OBJC_RUNTIME_LIB), apple)
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Application\ Support/TalkSoup/InFilters
+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Application\ Support/TalkSoup/InFilters
 else
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/ApplicationSupport/TalkSoup/InFilters
+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/ApplicationSupport/TalkSoup/InFilters
 endif
 
 Decolorizer_LANGUAGES = English
diff -Naur TalkSoup-1.0alpha.orig/InFilters/Dereverse/GNUmakefile TalkSoup-1.0alpha/InFilters/Dereverse/GNUmakefile
--- TalkSoup-1.0alpha.orig/InFilters/Dereverse/GNUmakefile	2007-05-12 12:37:56.000000000 +0200
+++ TalkSoup-1.0alpha/InFilters/Dereverse/GNUmakefile	2007-05-12 16:31:53.000000000 +0200
@@ -4,9 +4,9 @@
 BUNDLE_EXTENSION =
 
 ifeq ($(OBJC_RUNTIME_LIB), apple)
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Application\ Support/TalkSoup/InFilters
+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Application\ Support/TalkSoup/InFilters
 else
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/ApplicationSupport/TalkSoup/InFilters
+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/ApplicationSupport/TalkSoup/InFilters
 endif
 
 Dereverse_LANGUAGES = English
diff -Naur TalkSoup-1.0alpha.orig/InFilters/Deunderline/GNUmakefile TalkSoup-1.0alpha/InFilters/Deunderline/GNUmakefile
--- TalkSoup-1.0alpha.orig/InFilters/Deunderline/GNUmakefile	2007-05-12 12:37:56.000000000 +0200
+++ TalkSoup-1.0alpha/InFilters/Deunderline/GNUmakefile	2007-05-12 16:31:53.000000000 +0200
@@ -4,9 +4,9 @@
 BUNDLE_EXTENSION =
 
 ifeq ($(OBJC_RUNTIME_LIB), apple)
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Application\ Support/TalkSoup/InFilters
+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Application\ Support/TalkSoup/InFilters
 else
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/ApplicationSupport/TalkSoup/InFilters
+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/ApplicationSupport/TalkSoup/InFilters
 endif
 
 Deunderline_LANGUAGES = English
diff -Naur TalkSoup-1.0alpha.orig/InFilters/Emoticon/GNUmakefile TalkSoup-1.0alpha/InFilters/Emoticon/GNUmakefile
--- TalkSoup-1.0alpha.orig/InFilters/Emoticon/GNUmakefile	2007-05-12 12:37:56.000000000 +0200
+++ TalkSoup-1.0alpha/InFilters/Emoticon/GNUmakefile	2007-05-12 16:31:53.000000000 +0200
@@ -4,9 +4,9 @@
 BUNDLE_EXTENSION =
 
 ifeq ($(OBJC_RUNTIME_LIB), apple)
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Application\ Support/TalkSoup/InFilters
+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Application\ Support/TalkSoup/InFilters
 else
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/ApplicationSupport/TalkSoup/InFilters
+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/ApplicationSupport/TalkSoup/InFilters
 endif
 
 Emoticon_LANGUAGES = English
diff -Naur TalkSoup-1.0alpha.orig/InFilters/Highlighting/GNUmakefile TalkSoup-1.0alpha/InFilters/Highlighting/GNUmakefile
--- TalkSoup-1.0alpha.orig/InFilters/Highlighting/GNUmakefile	2007-05-12 12:37:56.000000000 +0200
+++ TalkSoup-1.0alpha/InFilters/Highlighting/GNUmakefile	2007-05-12 16:31:53.000000000 +0200
@@ -8,9 +8,9 @@
 endif
 
 ifeq ($(OBJC_RUNTIME_LIB), apple)
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Application\ Support/TalkSoup/InFilters
+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Application\ Support/TalkSoup/InFilters
 else
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/ApplicationSupport/TalkSoup/InFilters
+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/ApplicationSupport/TalkSoup/InFilters
 endif
 
 Highlighting_OBJC_FILES = Highlighting.m 
diff -Naur TalkSoup-1.0alpha.orig/InFilters/KeepAlive/GNUmakefile TalkSoup-1.0alpha/InFilters/KeepAlive/GNUmakefile
--- TalkSoup-1.0alpha.orig/InFilters/KeepAlive/GNUmakefile	2007-05-12 12:37:56.000000000 +0200
+++ TalkSoup-1.0alpha/InFilters/KeepAlive/GNUmakefile	2007-05-12 16:31:53.000000000 +0200
@@ -4,9 +4,9 @@
 BUNDLE_EXTENSION =
 
 ifeq ($(OBJC_RUNTIME_LIB), apple)
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Application\ Support/TalkSoup/InFilters
+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Application\ Support/TalkSoup/InFilters
 else
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/ApplicationSupport/TalkSoup/InFilters
+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/ApplicationSupport/TalkSoup/InFilters
 endif
 
 KeepAlive_LANGUAGES = English
diff -Naur TalkSoup-1.0alpha.orig/InFilters/Logging/GNUmakefile TalkSoup-1.0alpha/InFilters/Logging/GNUmakefile
--- TalkSoup-1.0alpha.orig/InFilters/Logging/GNUmakefile	2007-05-12 12:37:56.000000000 +0200
+++ TalkSoup-1.0alpha/InFilters/Logging/GNUmakefile	2007-05-12 16:31:53.000000000 +0200
@@ -4,9 +4,9 @@
 BUNDLE_EXTENSION =
 
 ifeq ($(OBJC_RUNTIME_LIB), apple)
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Application\ Support/TalkSoup/InFilters
+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Application\ Support/TalkSoup/InFilters
 else
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/ApplicationSupport/TalkSoup/InFilters
+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/ApplicationSupport/TalkSoup/InFilters
 endif
 
 Logging_LANGUAGES = English
diff -Naur TalkSoup-1.0alpha.orig/InFilters/MessageInTab/GNUmakefile TalkSoup-1.0alpha/InFilters/MessageInTab/GNUmakefile
--- TalkSoup-1.0alpha.orig/InFilters/MessageInTab/GNUmakefile	2007-05-12 12:37:56.000000000 +0200
+++ TalkSoup-1.0alpha/InFilters/MessageInTab/GNUmakefile	2007-05-12 16:31:53.000000000 +0200
@@ -4,9 +4,9 @@
 BUNDLE_EXTENSION =
 
 ifeq ($(OBJC_RUNTIME_LIB), apple)
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Application\ Support/TalkSoup/InFilters
+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Application\ Support/TalkSoup/InFilters
 else
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/ApplicationSupport/TalkSoup/InFilters
+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/ApplicationSupport/TalkSoup/InFilters
 endif
 
 MessageInTab_LANGUAGES = English
diff -Naur TalkSoup-1.0alpha.orig/InFilters/MessageOutTab/GNUmakefile TalkSoup-1.0alpha/InFilters/MessageOutTab/GNUmakefile
--- TalkSoup-1.0alpha.orig/InFilters/MessageOutTab/GNUmakefile	2007-05-12 12:37:56.000000000 +0200
+++ TalkSoup-1.0alpha/InFilters/MessageOutTab/GNUmakefile	2007-05-12 16:31:53.000000000 +0200
@@ -4,9 +4,9 @@
 BUNDLE_EXTENSION =
 
 ifeq ($(OBJC_RUNTIME_LIB), apple)
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Application\ Support/TalkSoup/InFilters
+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Application\ Support/TalkSoup/InFilters
 else
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/ApplicationSupport/TalkSoup/InFilters
+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/ApplicationSupport/TalkSoup/InFilters
 endif
 
 MessageOutTab_LANGUAGES = English
diff -Naur TalkSoup-1.0alpha.orig/InFilters/PrivateBeep/GNUmakefile TalkSoup-1.0alpha/InFilters/PrivateBeep/GNUmakefile
--- TalkSoup-1.0alpha.orig/InFilters/PrivateBeep/GNUmakefile	2007-05-12 12:37:56.000000000 +0200
+++ TalkSoup-1.0alpha/InFilters/PrivateBeep/GNUmakefile	2007-05-12 16:31:53.000000000 +0200
@@ -4,9 +4,9 @@
 BUNDLE_EXTENSION =
 
 ifeq ($(OBJC_RUNTIME_LIB), apple)
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Application\ Support/TalkSoup/InFilters
+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Application\ Support/TalkSoup/InFilters
 else
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/ApplicationSupport/TalkSoup/InFilters
+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/ApplicationSupport/TalkSoup/InFilters
 endif
 
 PrivateBeep_LANGUAGES = English
diff -Naur TalkSoup-1.0alpha.orig/InFilters/Skeleton/GNUmakefile TalkSoup-1.0alpha/InFilters/Skeleton/GNUmakefile
--- TalkSoup-1.0alpha.orig/InFilters/Skeleton/GNUmakefile	2007-05-12 12:37:56.000000000 +0200
+++ TalkSoup-1.0alpha/InFilters/Skeleton/GNUmakefile	2007-05-12 16:31:53.000000000 +0200
@@ -4,9 +4,9 @@
 BUNDLE_EXTENSION =
 
 ifeq ($(OBJC_RUNTIME_LIB), apple)
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Application\ Support/TalkSoup/InFilters
+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Application\ Support/TalkSoup/InFilters
 else
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/ApplicationSupport/TalkSoup/InFilters
+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/ApplicationSupport/TalkSoup/InFilters
 endif
 
 Skeleton_LANGUAGES = English
diff -Naur TalkSoup-1.0alpha.orig/Input/NetclassesInput/GNUmakefile TalkSoup-1.0alpha/Input/NetclassesInput/GNUmakefile
--- TalkSoup-1.0alpha.orig/Input/NetclassesInput/GNUmakefile	2007-05-12 12:37:56.000000000 +0200
+++ TalkSoup-1.0alpha/Input/NetclassesInput/GNUmakefile	2007-05-12 16:31:53.000000000 +0200
@@ -4,9 +4,9 @@
 BUNDLE_EXTENSION =
 
 ifeq ($(OBJC_RUNTIME_LIB), apple)
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Application\ Support/TalkSoup/Input
+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Application\ Support/TalkSoup/Input
 else
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/ApplicationSupport/TalkSoup/Input
+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/ApplicationSupport/TalkSoup/Input
 endif
 
 ifeq ($(OBJC_RUNTIME_LIB), apple)
diff -Naur TalkSoup-1.0alpha.orig/OutFilters/Colorizer/GNUmakefile TalkSoup-1.0alpha/OutFilters/Colorizer/GNUmakefile
--- TalkSoup-1.0alpha.orig/OutFilters/Colorizer/GNUmakefile	2007-05-12 12:37:56.000000000 +0200
+++ TalkSoup-1.0alpha/OutFilters/Colorizer/GNUmakefile	2007-05-12 16:31:53.000000000 +0200
@@ -4,9 +4,9 @@
 BUNDLE_EXTENSION =
 
 ifeq ($(OBJC_RUNTIME_LIB), apple)
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Application\ Support/TalkSoup/OutFilters
+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Application\ Support/TalkSoup/OutFilters
 else
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/ApplicationSupport/TalkSoup/OutFilters
+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/ApplicationSupport/TalkSoup/OutFilters
 endif
 
 Colorizer_LANGUAGES = English
diff -Naur TalkSoup-1.0alpha.orig/OutFilters/Piper/GNUmakefile TalkSoup-1.0alpha/OutFilters/Piper/GNUmakefile
--- TalkSoup-1.0alpha.orig/OutFilters/Piper/GNUmakefile	2007-05-12 12:37:56.000000000 +0200
+++ TalkSoup-1.0alpha/OutFilters/Piper/GNUmakefile	2007-05-12 16:31:53.000000000 +0200
@@ -4,9 +4,9 @@
 BUNDLE_EXTENSION =
 
 ifeq ($(OBJC_RUNTIME_LIB), apple)
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Application\ Support/TalkSoup/OutFilters
+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Application\ Support/TalkSoup/OutFilters
 else
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/ApplicationSupport/TalkSoup/OutFilters
+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/ApplicationSupport/TalkSoup/OutFilters
 endif
 
 Piper_LANGUAGES = English
diff -Naur TalkSoup-1.0alpha.orig/OutFilters/Skeleton/GNUmakefile TalkSoup-1.0alpha/OutFilters/Skeleton/GNUmakefile
--- TalkSoup-1.0alpha.orig/OutFilters/Skeleton/GNUmakefile	2007-05-12 12:37:56.000000000 +0200
+++ TalkSoup-1.0alpha/OutFilters/Skeleton/GNUmakefile	2007-05-12 16:31:53.000000000 +0200
@@ -4,9 +4,9 @@
 BUNDLE_EXTENSION =
 
 ifeq ($(OBJC_RUNTIME_LIB), apple)
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Application\ Support/TalkSoup/OutFilters
+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Application\ Support/TalkSoup/OutFilters
 else
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/ApplicationSupport/TalkSoup/OutFilters
+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/ApplicationSupport/TalkSoup/OutFilters
 endif
 
 Skeleton_LANGUAGES = English
diff -Naur TalkSoup-1.0alpha.orig/Output/GNUstepOutput/GNUmakefile TalkSoup-1.0alpha/Output/GNUstepOutput/GNUmakefile
--- TalkSoup-1.0alpha.orig/Output/GNUstepOutput/GNUmakefile	2007-05-12 12:37:56.000000000 +0200
+++ TalkSoup-1.0alpha/Output/GNUstepOutput/GNUmakefile	2007-05-12 16:31:53.000000000 +0200
@@ -3,9 +3,9 @@
 BUNDLE_NAME = GNUstepOutput
 
 ifeq ($(OBJC_RUNTIME_LIB), apple)
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Application\ Support/TalkSoup/Output
+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Application\ Support/TalkSoup/Output
 else
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/ApplicationSupport/TalkSoup/Output
+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/ApplicationSupport/TalkSoup/Output
 endif
 
 BUNDLE_EXTENSION =