diff -ur expander/src/Makefile expander-gentoo/src/Makefile
--- expander/src/Makefile	2003-10-30 14:52:00.000000000 +1300
+++ expander-gentoo/src/Makefile	2003-10-30 15:50:02.000000000 +1300
@@ -3,15 +3,14 @@
 bindir = $(BINDIR)/
 
 copy     = ln -fs
-CFLAGS  += -v -g # -DNEED_GETOPT_PROTO_TYPE
-compiler = cc $(CFLAGS)
+compiler = gcc $(CFLAGS)
 
 executables = expander boxcomment align_columns align_comments where_is
 
 #--------------
 # Build Targets
 #--------------
-all: verify $(executables)
+all: $(executables)
 
 verify:
 	@if [ "$(bindir)" = "/" ]; then \
@@ -24,32 +23,31 @@
 # Abbreviation expansion filter program (with NEdit, language sensitive)
 #-----------------------------------------------------------------------
 expander: expander.c             
-	$(compiler) -o $(bindir)$@ $?  
+	$(compiler) -o $@ $?
 
 #--------------------------------------------------------------------------
 # Surround given text with open ended box. (with NEdit, language sensitive)
 #--------------------------------------------------------------------------
 boxcomment: boxcomment.c
-	$(compiler) -o $(bindir)$@ $?
-	@if [ ! -f $(bindir)un$@ ]; then $(copy) $(bindir)$@ $(bindir)un$@; fi
+	$(compiler) -o $@ $?
 
 #-------------------------------------------------------------------------------
 # Align ragged looking 'C' style comments (good substitute for align_equals too)
 #-------------------------------------------------------------------------------
 align_comments: align_comments.c
-	$(compiler) -o $(bindir)$@ $?
+	$(compiler) -o $@ $?
 
 #----------------------------
 # Align given text in columns
 #----------------------------
 align_columns: align_columns.c
-	$(compiler) -o $(bindir)$@ $?
+	$(compiler) -o $@ $?
 
 #----------------------------------------------
 # File locator (substitute for which, where...)
 #----------------------------------------------
 where_is: where_is.c
-	$(compiler) -o $(bindir)$@ $?
+	$(compiler) -o $@ $?
 
 #------------------------------------------------
 # Here is how to uninstall the executables built.