X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=Makefile.in;h=9a146474105d268388f71b88cfd78043b91c5711;hb=278d7bafdc18c92dd9703de8154ec3b9d04bbdda;hp=5aacd021e0563adde2e57e3209192b5a7aaf3d1a;hpb=931e3064081dadcc5beeaa4319f85dcbb7d764b3;p=ir-tcl-moved-to-github.git

diff --git a/Makefile.in b/Makefile.in
index 5aacd02..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.6 1995-06-25 10:24:59 adam Exp $
+# $Id: Makefile.in,v 1.19 1995-10-12 14:46:52 adam Exp $
 SHELL=/bin/sh
 
 # IrTcl Version
-VERSION=1.0
+VERSION=1.0b3
 
 # Directory prefix with machine independent files (scripts, setup files, etc.)
 prefix = @prefix@
@@ -24,13 +24,16 @@ YAZDIR=@YAZDIR@
 MOSIDIR=@MOSIDIR@
 LIBS=@LIBS@ -lm
 
+CC=@CC@
+
 # X11 libraries and include file paths
 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@
@@ -39,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)\" \
@@ -50,12 +53,12 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 RANLIB = @RANLIB@
 
-O=ir-tcl.o marc.o
+O=ir-tcl.o marc.o queue.o mem.o grs.o
 
 all: ir-tk ir-tcl
 
-ir-tk: libirtcl.a tkmain.o
-	$(CC) $(CFLAGS) tkmain.o -o ir-tk libirtcl.a $(YAZLIB) $(TKLIB) \
+ir-tk: libirtcl.a tkinit.o
+	$(CC) $(CFLAGS) tkinit.o -o ir-tk libirtcl.a $(YAZLIB) $(TKLIB) \
 	$(TCLLIB) $(XLIB) $(LIBS)
 
 ir-tcl: libirtcl.a tclmain.o
@@ -67,22 +70,51 @@ libirtcl.a: $(O)
 	$(RANLIB) libirtcl.a
 
 install: ir-tcl
-	for d in $(IRTCLDIR) $(IRTCLDIR)/formats $(IRTCLDIR)/bitmaps; do \
+	@for d in $(IRTCLDIR) $(IRTCLDIR)/formats $(IRTCLDIR)/bitmaps; do \
 		if [ ! -d $$d ]; then \
 			echo Making $$d; \
 			mkdir $$d; \
 			chmod 755 $$d; \
 		fi; \
 	done;
-	$(INSTALL_PROGRAM) ir-tcl $(BINDIR)
-	$(INSTALL_DATA) libirtcl.a $(LIBDIR)
-	$(INSTALL_DATA) ir-tcl.h $(INCDIR)
-	$(INSTALL_DATA) LICENSE clientrc.tcl $(IRTCLDIR)
-	sed "s,^set libdir LIBDIR,set libdir $(IRTCLDIR)," <client.tcl >client.bak
-	if [ -f ir-tk ]; then $(INSTALL_PROGRAM) ir-tk $(BINDIR)
-	$(INSTALL_DATA) client.bak $(IRTCLDIR)/client.tcl
-	$(INSTALL_DATA) formats/*.tcl $(IRTCLDIR)/formats
-	$(INSTALL_DATA) bitmaps/book? $(IRTCLDIR)/bitmaps
+	@echo "Installing ir-tcl"
+	@$(INSTALL_PROGRAM) ir-tcl $(BINDIR)
+	@echo "Installing libirtcl.a"
+	@$(INSTALL_DATA) libirtcl.a $(LIBDIR)
+	@echo "Installing ir-tcl.h"
+	@$(INSTALL_DATA) ir-tcl.h $(INCDIR)
+	@if [ -f ir-tk ]; then \
+		echo "Installing ir-tk"; \
+		$(INSTALL_PROGRAM) ir-tk $(BINDIR); \
+		echo "Installing irclient"; \
+		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; \
+		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"; \
+		for b in formats/*.tcl; do \
+			if [ -f $$b ]; then \
+				$(INSTALL_DATA) $$b $(IRTCLDIR)/formats; \
+			fi; \
+		done; \
+		echo "Installing bitmaps"; \
+		for b in bitmaps/*; do \
+			if [ -f $$b ]; then \
+				$(INSTALL_DATA) $$b $(IRTCLDIR)/bitmaps; \
+			fi; \
+		done; \
+	fi; 
 
 clean:
 	rm -f *.[oa] ir-tk ir-tcl core gmon.out mon.out *.bak config.cache
@@ -108,5 +140,5 @@ distribution:
 .c.o:
 	$(CC) -c $(CFLAGS) $(DEFS) $<
 
-$(O) tkmain.o tclmain.o: ir-tcl.h ir-tclp.h
+$(O) tkinit.o tclmain.o: ir-tcl.h ir-tclp.h