--- dahdi-tools-2.2.0/xpp/Makefile.orig	2010-01-13 16:09:48.000000000 -0800
+++ dahdi-tools-2.2.0/xpp/Makefile	2010-01-13 16:45:44.000000000 -0800
@@ -102,21 +102,21 @@ ifneq	(,$(PERLLIBDIR))
 endif
 
 fpga_load: fpga_load.o hexfile.o
-	$(CC) -L. -o $@ $^ $(EXTRA_LIBS) $(USB_LIB)
+	$(LD) $(LDFLAGS) -L. -o $@ $^ $(EXTRA_LIBS) $(USB_LIB)
 
 astribank_hexload: $(ABHEXLOAD_OBJS)
-	$(CC) -L. -o $@ $(ABHEXLOAD_OBJS) $(EXTRA_LIBS) $(USB_LIB)
+	$(LD) $(LDFLAGS) -L. -o $@ $(ABHEXLOAD_OBJS) $(EXTRA_LIBS) $(USB_LIB)
 
 astribank_tool: $(ABTOOL_OBJS)
-	$(CC) -L. -o $@ $(ABTOOL_OBJS) $(EXTRA_LIBS) $(USB_LIB)
+	$(LD) $(LDFLAGS) -L. -o $@ $(ABTOOL_OBJS) $(EXTRA_LIBS) $(USB_LIB)
 
 astribank_allow: $(ABALLOW_OBJS)
-	$(CC) -L. -o $@ $(ABALLOW_OBJS) $(EXTRA_LIBS) $(USB_LIB)
+	$(LD) $(LDFLAGS) -L. -o $@ $(ABALLOW_OBJS) $(EXTRA_LIBS) $(USB_LIB)
 
 fpga_load.o: CFLAGS+=-D_GNU_SOURCE	# We use memrchr()
 
 test_parse: test_parse.o hexfile.o
-	$(CC) -L. -o $@ $^ $(EXTRA_LIBS) $(USB_LIB)
+	$(LD) $(LDFLAGS) -L. -o $@ $^ $(EXTRA_LIBS) $(USB_LIB)
 
 
 .perlcheck: $(PERL_SCRIPTS)
--- dahdi-tools-2.2.0/makeopts.in.orig	2008-09-12 11:06:41.000000000 -0700
+++ dahdi-tools-2.2.0/makeopts.in	2010-01-13 16:49:15.000000000 -0800
@@ -1,4 +1,5 @@
 CC=@CC@
+LD=@LD@
 HOSTCC=@HOSTCC@
 CFLAGS=@CFLAGS@
 LDFLAGS=@LDFLAGS@
--- dahdi-tools-2.2.0/configure.ac.orig	2009-01-16 06:18:10.000000000 -0800
+++ dahdi-tools-2.2.0/configure.ac	2010-01-13 17:16:00.000000000 -0800
@@ -29,6 +29,8 @@ fi
 # This needs to be before any macros that use the C compiler
 AC_GNU_SOURCE
 
+AC_SUBST(LD)
+
 # Checks for programs.
 AC_PROG_CC
 AC_PROG_CPP