--- vkeybd/Makefile.old	2006-11-25 11:39:42.000000000 +0100
+++ vkeybd/Makefile	2006-11-25 11:40:09.000000000 +0100
@@ -81,7 +81,7 @@
 
 VKB_TCLFILE = $(VKBLIB_DIR)/vkeybd.tcl
 
-CFLAGS = -Wall -O -DVKB_TCLFILE=\"$(VKB_TCLFILE)\" \
+CFLAGS = -Wall -O $(EXTRACFLAGS) -DVKB_TCLFILE=\"$(VKB_TCLFILE)\" \
 	-DVKBLIB_DIR=\"$(VKBLIB_DIR)\"\
 	-DVERSION_STR=\"$(VERSION)\"\
 	$(DEVICES) $(XINC) $(TCLINC) $(TKINC) $(LADCCACFLAGS)
@@ -91,15 +91,15 @@
 all: $(TARGETS)
 
 vkeybd: vkb.o vkb_device.o $(DEVOBJS) $(EXTRAOBJS)
-	$(CC) -o $@ $^ $(TKLIB) $(TCLLIB) $(XLIB) $(EXTRALIB) -lm
+	$(CC) $(LDFLAGS) -o $@ $^ $(TKLIB) $(TCLLIB) $(XLIB) $(EXTRALIB) -lm
 
 sftovkb: sftovkb.o sffile.o malloc.o fskip.o
-	$(CC) -o $@ $^ -lm
+	$(CC) $(LDFLAGS) -o $@ $^ -lm
 
 install: $(TARGETS) vkeybd.tcl vkeybd.list
 	mkdir -p $(DESTDIR)$(BIN_DIR)
-	install -c -s vkeybd $(DESTDIR)$(BIN_DIR)
-	install -c -s sftovkb $(DESTDIR)$(BIN_DIR)
+	install -c vkeybd $(DESTDIR)$(BIN_DIR)
+	install -c sftovkb $(DESTDIR)$(BIN_DIR)
 	rm -f $(DESTDIR)$(BIN_DIR)/vkeybd.tcl
 	mkdir -p $(DESTDIR)$(VKBLIB_DIR)
 	install -c -m 444 vkeybd.tcl $(DESTDIR)$(VKBLIB_DIR)