X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=Makefile.in;h=a9281c771a512edd8e58402ae5553643646e62bb;hb=c594394608a2d72bd7b73dfa20bbe5cde7187637;hp=11ea34d8af7470dc42af1a72eea721e7683da550;hpb=e1cd6b9b368f10e79a2fe36b2f0c6d671e892729;p=ir-tcl-moved-to-github.git

diff --git a/Makefile.in b/Makefile.in
index 11ea34d..a9281c7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,7 +2,7 @@
 # (c) Index Data 1995-1999
 # See the file LICENSE for details.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile.in,v 1.49 1999-02-11 09:13:23 adam Exp $
+# $Id: Makefile.in,v 1.52 1999-11-30 14:05:58 adam Exp $
 SHELL=/bin/sh
 
 # IrTcl Version
@@ -14,14 +14,16 @@ prefix = @prefix@
 # Directory prefix with machine dependent files (executables, libraries)
 exec_prefix = @exec_prefix@
 
+# RPM Root
+BUILD=@build_root@
+
+# Install directories
 BINDIR=$(exec_prefix)/bin
 LIBDIR=$(exec_prefix)/lib
 MANDIR=$(prefix)/man
 INCDIR=$(prefix)/include
 IRTCLDIR=$(prefix)/lib/irtcl
 
-YAZDIR=@YAZDIR@
-
 CC=@CC@
 
 # Tcl libraries and include files
@@ -38,20 +40,18 @@ SHLIB_LD = @SHLIB_LD@
 SHLIB_SUFFIX = @SHLIB_SUFFIX@
 SHLIB_VERSION = @SHLIB_VERSION@
 
-# MOSI settings, directory with libmosi.a and source
-MOSI=@MOSI@
-MOSIDIR=@MOSIDIR@
-MOSILIB=@MOSILIB@
-MOSIINC=@MOSIINC@
-
-# All YAZ libraries - including MOSI libraries.
-YAZLIB=$(YAZDIR)/lib/libyaz.a $(MOSILIB)
+# Where are Yaz libraries located?
+YAZLIB=@YAZLIB@
+# Where are Yaz header files located?
+YAZINC=@YAZINC@
+# If Yaz is compiled with mosi support uncomment and specify.
+#OSILIB=../../xtimosi/src/libmosi.a ../../yaz/lib/librfc.a
 
 # All include paths
-INCLUDE=-I. -I$(YAZDIR)/z39.50 -I$(YAZDIR)/include $(TKINC) $(TCLINC) $(MOSIINC)
+INCLUDE=-I. $(YAZINC) $(TKINC) $(TCLINC) 
 
 # All command line options except CFLAGS
-DEFS=-DCCL2RPN=0 @DEFS@ -DMOSI=$(MOSI) -DIRTCLDIR=\"$(IRTCLDIR)\" \
+DEFS=-DCCL2RPN=0 @DEFS@ -DIRTCLDIR=\"$(IRTCLDIR)\" \
 	$(INCLUDE) -DIR_TCL_VERSION=\"$(VERSION)\"
 
 INSTALL = @INSTALL@
@@ -92,76 +92,52 @@ wais-tcl.o: wais-tcl.c
 	$(CC) -c $(CFLAGS) -I$(WAISDIR)/ir $(DEFS) wais-tcl.c
 
 install.man:
-	@echo "Installation of man-pages"
-	@if [ ! -d $(MANDIR) ]; then \
-		echo Making $(MANDIR); \
-		mkdir $(MANDIR); \
-	fi
-	@if [ ! -d $(MANDIR)/mann ]; then \
-		echo Making $(MANDIR)/mann; \
-		mkdir $(MANDIR)/mann; \
-	fi
-	@cd doc; if [ -d $(MANDIR)/mann ]; then \
+	$(INSTALL) -d $(BUILD)$(MANDIR)/mann
+	@cd doc; if [ -d $(BUILD)$(MANDIR)/mann ]; then \
 		for p in *.n; do \
-			echo "Installing $$p"; \
-			$(INSTALL_DATA) $$p $(MANDIR)/mann; \
+			$(INSTALL_DATA) $$p $(BUILD)$(MANDIR)/mann; \
 		done; \
 	fi
 
 install: @ALL_SPEC@
-	@for d in $(IRTCLDIR) $(IRTCLDIR)/formats $(IRTCLDIR)/bitmaps; do \
-		if [ ! -d $$d ]; then \
-			echo Making $$d; \
-			mkdir $$d; \
-			chmod 755 $$d; \
-		fi; \
-	done;
+	$(INSTALL) -d $(BUILD)$(IRTCLDIR)/formats
+	$(INSTALL) -d $(BUILD)$(IRTCLDIR)/bitmaps
+	$(INSTALL) -d $(BUILD)$(BINDIR)
 	@if [ -f ir-tcl ]; then \
-		echo "Installing ir-tcl"; \
-		$(INSTALL_PROGRAM) ir-tcl $(BINDIR); \
+		$(INSTALL_PROGRAM) ir-tcl $(BUILD)$(BINDIR); \
 	fi
 	@if [ -f @SHLIB_IRTCL@ ]; then \
-		echo "Installing @SHLIB_IRTCL@"; \
-		$(INSTALL_PROGRAM) @SHLIB_IRTCL@ $(IRTCLDIR); \
+		$(INSTALL_PROGRAM) @SHLIB_IRTCL@ $(BUILD)$(IRTCLDIR); \
 	fi
-	@echo "Installing libirtcl.a"
-	@$(INSTALL_DATA) libirtcl.a $(LIBDIR)
-	@echo "Installing ir-tcl.h"
-	@$(INSTALL_DATA) ir-tcl.h $(INCDIR)
+	$(INSTALL_DATA) libirtcl.a $(BUILD)$(LIBDIR)
+	$(INSTALL_DATA) ir-tcl.h $(BUILD)$(INCDIR)
 	@if [ -f ir-tk ]; then \
-		echo "Installing ir-tk"; \
-		$(INSTALL_PROGRAM) ir-tk $(BINDIR); \
-	fi; \
-	echo "Installing irclient"; \
-	echo "#! $(BINDIR)/@IRCLIENT_SHELL@ -f" >head.bak; \
+		$(INSTALL_PROGRAM) ir-tk $(BUILD)$(BINDIR); \
+	fi
+	@echo "#! $(BINDIR)/@IRCLIENT_SHELL@ -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)/irtdb.tcl ]; then \
+	$(INSTALL_PROGRAM) client.bak $(BUILD)$(BINDIR)/irclient; \
+	if [ -f $(BUILD)$(IRTCLDIR)/irtdb.tcl ]; then \
 		echo "irtdb.tcl already exists"; \
 		echo "Installing irtdb.tcl.n"; \
 		cp irtdb.tcl irtdb.tcl.n; \
-		$(INSTALL_DATA) irtdb.tcl.n $(IRTCLDIR); \
+		$(INSTALL_DATA) irtdb.tcl.n $(BUILD)$(IRTCLDIR); \
 		rm irtdb.tcl.n; \
 	else \
 		echo "Installing irtdb.tcl"; \
-		$(INSTALL_DATA) irtdb.tcl $(IRTCLDIR); \
-	fi; \
-	for f in *.tcl; do \
-		echo "Installing $$f"; \
-		$(INSTALL_DATA) $$f $(IRTCLDIR); \
-	done; \
-	echo "Installing LICENSE" ; \
-	$(INSTALL_DATA) LICENSE $(IRTCLDIR); \
-	echo "Installing display format scripts"; \
-	for b in formats/*.tcl; do \
+		$(INSTALL_DATA) irtdb.tcl $(BUILD)$(IRTCLDIR); \
+	fi
+	@for f in *.tcl; do \
+		$(INSTALL_DATA) $$f $(BUILD)$(IRTCLDIR); \
+	done
+	@for b in formats/*.tcl; do \
 		if [ -f $$b ]; then \
-			$(INSTALL_DATA) $$b $(IRTCLDIR)/formats; \
+			$(INSTALL_DATA) $$b $(BUILD)$(IRTCLDIR)/formats; \
 		fi; \
-	done; \
-	echo "Installing bitmaps"; \
-	for b in bitmaps/*; do \
+	done
+	@for b in bitmaps/*; do \
 		if [ -f $$b ]; then \
-			$(INSTALL_DATA) $$b $(IRTCLDIR)/bitmaps; \
+			$(INSTALL_DATA) $$b $(BUILD)$(IRTCLDIR)/bitmaps; \
 		fi; \
 	done
 
@@ -176,21 +152,16 @@ autoconf:
 
 distribution:
 	echo "Making distribution version $(VERSION). Did you commit?"
-	autoconf
 	if [ -d tmp ]; then \
 		rm -fr tmp; \
 	fi
 	mkdir tmp; cd tmp; cvs export -f -D now ir-tcl
 	rm tmp/ir-tcl/wais-tcl.c
-	cp configure tmp/ir-tcl
-	cd tmp; mv ir-tcl ir-tcl-$(VERSION)
-	cd tmp; tar zcf ../ir-tcl-$(VERSION).tar.gz ir-tcl-$(VERSION)
-	cd tmp; mv ir-tcl-$(VERSION) ir-tcl
 	cd tmp/ir-tcl/doc; make all
-	mv tmp/ir-tcl/doc/ir-tcl.txt .; gzip -f ir-tcl.txt
-	mv tmp/ir-tcl/doc/ir-tcl.ps .; gzip -f ir-tcl.ps
-	cd tmp/ir-tcl; mkdir irtcl; cp doc/*.html CHANGELOG irtcl
-	cd tmp/ir-tcl; tar zcf ../../irtclhtml.tar.gz irtcl
+	cp tmp/ir-tcl/doc/*.html .
+	cp tmp/ir-tcl/CHANGELOG .
+	mv tmp/ir-tcl tmp/ir-tcl-$(VERSION)
+	cd tmp; tar zcvf ../ir-tcl-$(VERSION).tar.gz ir-tcl-$(VERSION)
 	rm -fr tmp
 
 .c.o: