--- zaptel-1.2.24/Makefile.original	2008-03-19 22:53:05.000000000 +0100
+++ zaptel-1.2.24/Makefile	2008-03-19 22:59:53.000000000 +0100
@@ -304,23 +304,23 @@
 	./makefw pciradio.rbt radfw > radfw.h
 
 gendigits makefw: %: %.c
-	$(HOSTCC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
+	$(HOSTCC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRALDFLAGS)
 
 $(UTILS): %: %.o
-	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
+	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRALDFLAGS)
 
 $(UTILSO): %.o: %.c
 	$(CC) $(CFLAGS) -c $<
 
-gendigits: LDFLAGS+=-lm
+gendigits: EXTRALDFLAGS+=-lm
 
 prereq: tones.h tor2fw.h radfw.h version.h
 
 zttool.o: zttool.c zaptel.h
-zttool: LDFLAGS+=-lnewt
+zttool: EXTRALDFLAGS+=-lnewt
 
 tor2ee.o: tor2-hw.h
-tor2ee: LDFLAGS+=-lpci
+tor2ee: EXTRALDFLAGS+=-lpci
 
 ztprovision.o: ztprovision.c zaptel.h
 
@@ -336,31 +336,31 @@
 	ar rcs libtonezone.a $^
 
 $(LIBTONEZONE_SO): $(TZOBJS)
-	$(CC) $(CFLAGS) -shared -Wl,-soname,$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) -o $@ $^ $(LDFLAGS) -lm
+	$(CC) $(CFLAGS) -shared -Wl,-soname,$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) -o $@ $^ $(LDFLAGS) $(EXTRALDFLAGS) -lm
 
 ztcfg.c: ztcfg.h
 
 ztcfg-shared: ztcfg.o $(LIBTONEZONE_SO)
-	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) -lm
+	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRALDFLAGS) -lm
 
 ztcfg: ztcfg.o libtonezone.a
-ztcfg: LDFLAGS+=-lm
+ztcfg: EXTRALDFLAGS+=-lm
 
-ztcfg-dude: LDFLAGS+=-lm -lstdc++
+ztcfg-dude: EXTRALDFLAGS+=-lm -lstdc++
 ztcfg-dude: ztcfg-dude.o mknotch.o complex.o $(LIBTONEZONE_SO)
 
 # FIXME: we assume CC can build the C++ modules:
 complex.o mknotch.o: %.o: %.cc
 	$(CC) $(CFLAGS) -o $@ -c $<
 
-usbfxstest: LDFLAGS+=-lzap
+usbfxstest: EXTRALDFLAGS+=-lzap
 
 fxstest: fxstest.o $(LIBTONEZONE_SO)
-fxstest: LDFLAGS+=-lm
+fxstest: EXTRALDFLAGS+=-lm
 
-fxotune: LDFLAGS+=-lm
+fxotune: EXTRALDFLAGS+=-lm
 
-fxsdump: LDFLAGS+=-lm
+fxsdump: EXTRALDFLAGS+=-lm
 
 stackcheck: checkstack all
 	./checkstack *.ko */*.ko