[patch] update makefile for software-dtk

[William Hubbs <w.d.hubbs@xxxxxxxxxxx>]

All,

here is a patch for the makefile for the software-dtk server.

This patch makes the following changes:

- supports tcl/tclx 8.4 or later.
- allows tcl version selection from within the makefile.
- adds DESTDIR support to the install target.

I can't test the driver since I don't have the dectalk software, so we
will need someone to compile and test this.

Thanks,

William

Index: Makefile
===================================================================
--- Makefile	(revision 6210)
+++ Makefile	(working copy)
@@ -2,16 +2,16 @@
 #
 LABEL=1.1
 DIST=software-dtk-$(LABEL)
-CFLAGS=-O3 -fpic -pedantic -ansi -Wall -I/usr/include/tcl8.3 -I/usr/include/tclX8.3
-CPPFLAGS=-DSTDC_HEADERS=1 -Dclock_t=long -DRETSIGTYPE=void 
+TCL_VERSION=8.4
+CFLAGS+=-O3 -fpic -pedantic -ansi -Wall -I/usr/include/tcl$(TCL_VERSION)
+CPPFLAGS+=-DSTDC_HEADERS=1 -Dclock_t=long -DRETSIGTYPE=void 
 INSTALL=install
-CC=gcc
-LIBS=-ltts -ltts_us -ltclx8.3
+LIBS=-ltts -ltts_us -ltcl$(TCL_VERSION)
 SERVER_DIR=/usr/share/emacs/site-lisp/emacspeak/servers/software-dtk
 FILES=tcldtk.c tcldtk.so tcldtk.o Makefile
 
 tcldtk.so: tcldtk.o
-	$(CC) $< $(LIBS)  -shared -o $@
+	$(CC) -shared -o $@ $< $(LIBS)
 
 dist: software-dtk.tar.gz
 
@@ -25,8 +25,8 @@
 	rm tcldtk.so tcldtk.o
 
 install:
-	$(INSTALL) -d $(SERVER_DIR)
-	cp  $(FILES) $(SERVER_DIR)
+	$(INSTALL) -d $(DESTDIR)$(SERVER_DIR)
+	cp  $(FILES) $(DESTDIR)$(SERVER_DIR)
 
 rpm: software-dtk.spec software-dtk.tar.gz
 	@cp software-dtk.tar.gz /usr/src/redhat/SOURCES/

Attachment: pgpS8WfE1quMW.pgp
Description: PGP signature