And I should remove these....

This commit is contained in:
angelos 1999-09-02 19:34:19 +00:00
parent 788672dd2e
commit 0cdde42af6
2 changed files with 0 additions and 56 deletions

View File

@ -1,29 +0,0 @@
--- freebsd/Makefile.freebsd.orig Thu May 8 15:25:52 1997
+++ freebsd/Makefile.freebsd Tue Sep 9 15:25:54 1997
@@ -1,11 +1,15 @@
-CC=gcc
-INCLUDES=-I/usr/local/include -I/usr/X11R6/include
-LIB_DIR=/usr/local/lib
-LIBS= $(LIB_DIR)/libtk41.a $(LIB_DIR)/libtcl75.a -lm -L/usr/X11R6/lib -lX11
-CFLAGS=-ggdb $(INCLUDES) -DFREEBSD -Wall -DNORANDPROTO -DDEFINED_ERRLIST
-LIBRARY_TCL = $(LIB_DIR)/tcl7.5
-LIBRARY_TK = $(LIB_DIR)/tk4.1
-all:: sdr
-install:
- cp ./sdr /cs/research/mice/speedy/common/freebsd/bin/sdr
- chmod 755 /cs/research/mice/speedy/common/freebsd/bin/sdr
+CC=cc
+INCLUDES=-I${LOCALBASE}/include/tk8.0 -I${LOCALBASE}/include/tcl8.0 -I${X11BASE}/include
+LIB_DIR=${LOCALBASE}/lib
+LIBS=-L${LIB_DIR} -ltk80 -ltcl80 -lm -L${X11BASE}/lib -lX11
+CFLAGS+=-ggdb $(INCLUDES) -DFREEBSD -DNORANDPROTO -DDEFINED_ERRLIST
+LIBRARY_TCL = ${LIB_DIR}/tcl8.0
+LIBRARY_TK = ${LIB_DIR}/tk8.0
+
+all: sdr
+
+install: sdr
+ install -c -s -m 555 -o bin -g bin sdr ${PREFIX}/bin
+
+clean:
+ rm *.o *.tcl *.ehtml tcl2c

View File

@ -1,27 +0,0 @@
--- src/ui_init.c.orig Fri Jan 8 18:14:34 1999
+++ src/ui_init.c Sat Jan 9 00:28:24 1999
@@ -104,6 +104,7 @@
#ifdef TCL_MEM_DEBUG
Tcl_InitMemory(interp);
#endif
+ Tcl_Init(interp);
/*
* Parse command-line arguments.
@@ -136,7 +137,7 @@
if (gui==GUI) {
if(Tk_Init(interp)!=TCL_OK)
{
- fprintf(stderr, "Sdr: %s\n", interp->result);
+ fprintf(stderr, "Sdr Tk_Init(): %s\n", interp->result);
exit(-1);
}
mainWindow = Tk_MainWindow(interp);
@@ -180,7 +181,6 @@
int ui_create_interface()
{
int i;
- announce_error(Tcl_VarEval(interp, tcl_libs, 0), "tcl_libs");
/*
* Set the geometry of the main window, if requested.