diff -urN everybuddy-0.2.1beta6.org/Makefile.am everybuddy-0.2.1beta6/Makefile.am
--- everybuddy-0.2.1beta6.org/Makefile.am	Tue Nov 13 09:21:39 2001
+++ everybuddy-0.2.1beta6/Makefile.am	Tue Nov 13 16:59:39 2001
@@ -1,8 +1,8 @@
 SUBDIRS = pixmaps m4 libproxy libtoc libicq libyahoo libmsn libxode libjabber sounds doc zephyr src 
 ACLOCAL_AMFLAGS = -I m4
 
-Utilitiesdir = /etc/X11/applnk/Internet
-Utilities_DATA = Everybuddy.desktop
+AUtilitiesdir = /etc/X11/applnk/Internet
+AUtilities_DATA = Everybuddy.desktop
 
 
 EXTRA_DIST = Everybuddy.desktop everybuddy.spec
diff -urN everybuddy-0.2.1beta6.org/libicq/Makefile.am everybuddy-0.2.1beta6/libicq/Makefile.am
--- everybuddy-0.2.1beta6.org/libicq/Makefile.am	Tue Nov 13 09:21:39 2001
+++ everybuddy-0.2.1beta6/libicq/Makefile.am	Tue Nov 13 16:59:25 2001
@@ -16,6 +16,6 @@
 	util.h			\
 	icqfile.c
 
-CFLAGS += $(EB_CFLAGS) $(GLIB_CFLAGS) -I../libproxy -D_XOPEN_SOURCE_EXTENDED \
+CFLAGS = @CFLAGS@ $(EB_CFLAGS) $(GLIB_CFLAGS) -I../libproxy -D_XOPEN_SOURCE_EXTENDED \
           -I$(top_srcdir)/libproxy
 
diff -urN everybuddy-0.2.1beta6.org/libjabber/Makefile.am everybuddy-0.2.1beta6/libjabber/Makefile.am
--- everybuddy-0.2.1beta6.org/libjabber/Makefile.am	Tue Nov 13 09:21:38 2001
+++ everybuddy-0.2.1beta6/libjabber/Makefile.am	Tue Nov 13 16:59:25 2001
@@ -7,7 +7,7 @@
 
 libEBjabber_a_SOURCES = libEBjabber.c
 
-CFLAGS += $(EB_CFLAGS) $(GLIB_CFLAGS) -I../src -I../libproxy \
+CFLAGS = @CFLAGS@ $(EB_CFLAGS) $(GLIB_CFLAGS) -I../src -I../libproxy \
  -I./include/jabber  -I./include\
 	-I$(top_srcdir)/libxode/include 
 libjabber_a_SOURCES = \
diff -urN everybuddy-0.2.1beta6.org/libmsn/Makefile.am everybuddy-0.2.1beta6/libmsn/Makefile.am
--- everybuddy-0.2.1beta6.org/libmsn/Makefile.am	Tue Nov 13 09:21:39 2001
+++ everybuddy-0.2.1beta6/libmsn/Makefile.am	Tue Nov 13 16:59:25 2001
@@ -4,5 +4,5 @@
 
 libmsn_a_SOURCES = libmsn.c msn_commands.c parse_utils.c md5.c errors.c chat_lists.c
 
-CFLAGS += $(EB_CFLAGS) -I../src -I../libproxy -I$(top_srcdir) $(GLIB_CFLAGS) $(GTK_CFLAGS)
+CFLAGS = @CFLAGS@ $(EB_CFLAGS) -I../src -I../libproxy -I$(top_srcdir) $(GLIB_CFLAGS) $(GTK_CFLAGS)
 
diff -urN everybuddy-0.2.1beta6.org/libproxy/Makefile.am everybuddy-0.2.1beta6/libproxy/Makefile.am
--- everybuddy-0.2.1beta6.org/libproxy/Makefile.am	Tue Nov 13 09:21:39 2001
+++ everybuddy-0.2.1beta6/libproxy/Makefile.am	Tue Nov 13 16:59:25 2001
@@ -1,7 +1,7 @@
 noinst_LIBRARIES = libproxy.a
 
 EXTRA_DIST =   libproxy.h
-CFLAGS += $(EB_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS)
+CFLAGS = @CFLAGS@ $(EB_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS)
 
 
 libproxy_a_SOURCES = proxy.c
diff -urN everybuddy-0.2.1beta6.org/libtoc/Makefile.am everybuddy-0.2.1beta6/libtoc/Makefile.am
--- everybuddy-0.2.1beta6.org/libtoc/Makefile.am	Tue Nov 13 09:21:39 2001
+++ everybuddy-0.2.1beta6/libtoc/Makefile.am	Tue Nov 13 16:59:25 2001
@@ -4,5 +4,5 @@
 
 libtoc_a_SOURCES = libtoc.c 
 
-CFLAGS += $(EB_CFLAGS) -I../src -I../libproxy -I$(top_srcdir) $(GLIB_CFLAGS) $(GTK_CFLAGS)
+CFLAGS = @CFLAGS@ $(EB_CFLAGS) -I../src -I../libproxy -I$(top_srcdir) $(GLIB_CFLAGS) $(GTK_CFLAGS)
 
diff -urN everybuddy-0.2.1beta6.org/libyahoo/Makefile.am everybuddy-0.2.1beta6/libyahoo/Makefile.am
--- everybuddy-0.2.1beta6.org/libyahoo/Makefile.am	Tue Nov 13 09:21:39 2001
+++ everybuddy-0.2.1beta6/libyahoo/Makefile.am	Tue Nov 13 16:59:25 2001
@@ -4,4 +4,4 @@
 
 libyahoo_a_SOURCES = yahoolib.c debug.c yahoo_util.c
 
-CFLAGS += $(EB_CFLAGS) -I../src -I../libproxy -I$(top_srcdir) $(GLIB_CFLAGS) $(GTK_CFLAGS)
+CFLAGS = @CFLAGS@ $(EB_CFLAGS) -I../src -I../libproxy -I$(top_srcdir) $(GLIB_CFLAGS) $(GTK_CFLAGS)
diff -urN everybuddy-0.2.1beta6.org/src/Makefile.am everybuddy-0.2.1beta6/src/Makefile.am
--- everybuddy-0.2.1beta6.org/src/Makefile.am	Tue Nov 13 09:21:38 2001
+++ everybuddy-0.2.1beta6/src/Makefile.am	Tue Nov 13 16:59:26 2001
@@ -2,11 +2,11 @@
 
 everybuddy_SOURCES = main.c contactlist.c editcontacts.c service.c icq.c status.c account.c aim-toc.c info_window.c chat_window.c util.c add_contact_window.c edit_contact_window.c  add_unknown_account.c  sound.c about.c dialog.c prefs.c yahoo.c away_window.c browser.c message_parse.c progress_window.c chat_room.c account_scanner.c account_parser.tab.c contact_scanner.c contact_parser.tab.c value_pair.c msn.c jabber.c edit_group_window.c importicq.c importlicq.c log_window.c gtkspell.c trigger.c console_session.c gtk_eb_html.c gtksctext.c input_list.c zephyr_mod.c irc.c
 
-CFLAGS += $(EB_CFLAGS) -I$(top_srcdir) -I../libproxy -I../libfaim  -I../libjabber/include/jabber -I../libjabber/include -I../libxode/include -I../zephyr/h
+CFLAGS = @CFLAGS@ $(EB_CFLAGS) -I$(top_srcdir) -I../libproxy -I../libfaim  -I../libjabber/include/jabber -I../libjabber/include -I../libxode/include -I../zephyr/h
 #there are more than one config.h
-LIBS += $(EB_LIBS)
-LDADD += $(EB_LDADD)
-CLEANFILES += config.h
+LIBS = @LIBS@ $(EB_LIBS)
+LDADD = $(EB_LDADD)
+CLEANFILES = @CLEANFILES@ config.h
 
 EXTRA_DIST = account.h icq.h aim.h msn.h yahoo.h service.h contact.h \
              globals.h externs.h status.h info_window.h chat_window.h util.h \
diff -urN everybuddy-0.2.1beta6.org/zephyr/Makefile.am everybuddy-0.2.1beta6/zephyr/Makefile.am
--- everybuddy-0.2.1beta6.org/zephyr/Makefile.am	Tue Nov 13 09:21:39 2001
+++ everybuddy-0.2.1beta6/zephyr/Makefile.am	Tue Nov 13 16:59:26 2001
@@ -3,5 +3,5 @@
 SUBDIRS = h
 libzephyr_a_SOURCES = mit-copyright.h ZAsyncLocate.c ZCkAuth.c ZCkIfNot.c ZClosePort.c ZCmpUID.c ZCmpUIDP.c ZFlsLocs.c ZFlsSubs.c ZFmtAuth.c ZFmtList.c ZFmtNotice.c ZFmtRaw.c ZFmtRawLst.c ZFmtSmRLst.c ZFmtSmRaw.c ZFreeNot.c ZGetLocs.c ZGetSender.c ZGetSubs.c ZGetWGPort.c ZIfNotice.c ZInit.c ZLocations.c ZMakeAscii.c ZMkAuth.c ZNewLocU.c ZOpenPort.c ZParseNot.c ZPeekIfNot.c ZPeekNot.c ZPeekPkt.c ZPending.c ZReadAscii.c ZRecvNot.c ZRecvPkt.c ZRetSubs.c ZSendList.c ZSendNot.c ZSendPkt.c ZSendRLst.c ZSendRaw.c ZSetDest.c ZSetFD.c ZSetSrv.c ZSubs.c ZVariables.c ZWait4Not.c ZhmStat.c Zinternal.c zephyr_err.c
 
-CFLAGS += $(EB_CFLAGS) -I../src -I../libproxy  -I./h -I$(top_srcdir) -DSYSCONFDIR=\"${sysconfdir}\" 
+CFLAGS = @CFLAGS@ $(EB_CFLAGS) -I../src -I../libproxy  -I./h -I$(top_srcdir) -DSYSCONFDIR=\"${sysconfdir}\"