X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=Makefile.in;h=9a146474105d268388f71b88cfd78043b91c5711;hb=0755d3460cea1541d1fc12852e4e25c2c9fd771e;hp=b98be9d9745a9bd00c2a26a3c05e3b8fd0a279ee;hpb=52284820cfaee3773182b71bc96fe2e307d9ee49;p=ir-tcl-moved-to-github.git

diff --git a/Makefile.in b/Makefile.in
index b98be9d..9a14647 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,11 +2,11 @@
 # (c) Index Data 1995
 # See the file LICENSE for details.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile.in,v 1.16 1995-08-29 15:30:12 adam Exp $
+# $Id: Makefile.in,v 1.19 1995-10-12 14:46:52 adam Exp $
 SHELL=/bin/sh
 
 # IrTcl Version
-VERSION=1.0b2
+VERSION=1.0b3
 
 # Directory prefix with machine independent files (scripts, setup files, etc.)
 prefix = @prefix@
@@ -30,9 +30,10 @@ CC=@CC@
 XLIB=@XLIBSW@
 XINCLUDE=@XINCLUDES@
 
-# Tcl/Tk libraries
+# Tcl/Tk libraries and include files
 TCLLIB=@TCLLIB@
 TKLIB=@TKLIB@
+TCLINCLUDE=@TCLINCLUDE@
 
 # MOSI directory with libmosi.a and source
 MOSILIB=@MOSILIB@
@@ -41,7 +42,7 @@ MOSILIB=@MOSILIB@
 YAZLIB=$(YAZDIR)/lib/libyaz.a $(MOSILIB) $(YAZDIR)/lib/libutil.a
 
 # All include paths
-INCLUDE=-I$(YAZDIR)/include $(XINCLUDE) -I$(MOSIDIR) -I/usr/local/include
+INCLUDE=-I$(YAZDIR)/include $(XINCLUDE) -I$(MOSIDIR) $(TCLINCLUDE)
 
 # All command line options except CFLAGS
 DEFS=-DCCL2RPN=0 @DEFS@ -DMOSI=@MOSI@ -DIRTCLDIR=\"$(IRTCLDIR)\" \
@@ -89,8 +90,16 @@ install: ir-tcl
 		echo "#! $(BINDIR)/ir-tk -f" >head.bak; \
 		cat head.bak client.tcl| sed "s,^set libdir LIBDIR,set libdir $(IRTCLDIR)," >client.bak; \
 		$(INSTALL_PROGRAM) client.bak $(BINDIR)/irclient; \
-		echo "Installing clientrc.tcl" ; \
-		$(INSTALL_DATA) clientrc.tcl $(IRTCLDIR); \
+		if [ -f $(IRTCLDIR)/clientrc.tcl ]; then \
+			echo "clientrc.tcl already exists"; \
+			echo "Installing clientrc.tcl.n"; \
+			cp clientrc.tcl clientrc.tcl.n; \
+			$(INSTALL_DATA) clientrc.tcl.n $(IRTCLDIR); \
+			rm clientrc.tcl.n; \
+		else \
+			echo "Installing clientrc.tcl"; \
+			$(INSTALL_DATA) clientrc.tcl $(IRTCLDIR); \
+		fi; \
 		echo "Installing LICENSE" ; \
 		$(INSTALL_DATA) LICENSE $(IRTCLDIR); \
 		echo "Installing display format scripts"; \