$NetBSD: patch-aa,v 1.12 2000/06/28 23:18:30 wiz Exp $

--- src/Makefile.in.orig	Sun Apr 23 05:57:42 2000
+++ src/Makefile.in	Thu Jun 29 01:06:01 2000
@@ -2,9 +2,9 @@
 #---------------------------------------------------------------------------
 # ANSI C compiler
 #---------------------------------------------------------------------------
-CC              = @CC@
+CC              = $(LIBTOOL) @CC@
 CFLAGS 		= @CFLAGS@
-LDFLAGS		= @LDFLAGS@ @DYNAMIC_LINK_FLAGS@
+LDFLAGS		= $(EXECLIBS)
 #-----------------------------------------------------------------------------
 # System library that contains functions for dynamic linking (-ldl)
 #-----------------------------------------------------------------------------
@@ -22,7 +22,7 @@
 # Set these values to ABSOLUTE path names
 #---------------------------------------------------------------------------
 SRCDIR = @SRCDIR@# Location of sources
-OBJDIR = @OBJDIR@# Location of objects
+OBJDIR = .# Location of objects
 ELFDIR = @ELFDIR@# Location of elf objects
 
 #---------------------------------------------------------------------------
@@ -36,7 +36,7 @@
 exec_prefix = @exec_prefix@
 install_lib_dir = @libdir@
 install_include_dir = @includedir@
-install_doc_dir = $(prefix)/doc/slang/@slang_version@
+install_doc_dir = $(prefix)/share/doc/slang
 DOC_FILES = ../changes.txt ../COPY* ../doc/slangdoc.html ../doc/text/*.txt
 #---------------------------------------------------------------------------
 # Misc commands (safe to leave these untouched)
@@ -69,7 +69,7 @@
 ELFCOMPILE_CMD		= $(ELF_CC) -c $(ALL_ELF_CFLAGS)
 ELF_LINK_CMD		= @ELF_LINK_CMD@
 
-NORMAL_LIB = lib$(THIS_LIB).a
+NORMAL_LIB = lib$(THIS_LIB).la
 OBJDIR_NORMAL_LIB = $(OBJDIR)/$(NORMAL_LIB)
 
 ELFLIB = lib$(THIS_LIB).so#
@@ -78,7 +78,7 @@
 
 ELFDIR_ELF_LIB = $(ELFDIR)/$(ELFLIB_MAJOR_MINOR)#
 
-EXECLIBS = -L$(OBJDIR) -lslang -lm $(TCAPLIB) $(DL_LIB)
+EXECLIBS = libslang.la $(TCAPLIB)
 EXECDEPS = $(OBJDIR_NORMAL_LIB)
 
 OFILES = @PROGRAM_OFILES@
@@ -94,13 +94,12 @@
 #---------------------------------------------------------------------------
 # Rules
 #---------------------------------------------------------------------------
-all: $(OBJDIR) $(CONFIG_H) $(OBJDIR_NORMAL_LIB) $(OTHERSTUFF)
+all: $(OBJDIR) $(CONFIG_H) $(OBJDIR_NORMAL_LIB)
 elf: $(ELFDIR) $(CONFIG_H) $(ELFDIR_ELF_LIB)
 
 $(OBJDIR_NORMAL_LIB): $(OBJDIR) $(CONFIG_H) $(OBJS)
-	-$(RM) $(OBJDIR_NORMAL_LIB)
-	cd $(OBJDIR); $(AR_CR) $(NORMAL_LIB) $(OFILES)
-	$(RANLIB) $(OBJDIR_NORMAL_LIB)
+	cd $(OBJDIR); $(LIBTOOL) --mode=link cc -o $(NORMAL_LIB) $(OFILES:.o=.lo) \
+		-rpath $(PREFIX)/lib -lm -ltermcap -version-info 1:4
 	@echo ""
 	@echo $(NORMAL_LIB) created in $(OBJDIR)
 
@@ -125,8 +124,7 @@
 install: install_basic_lib install_docs
 install_basic_lib: $(install_lib_dir) $(install_include_dir) $(OBJDIR_NORMAL_LIB)
 	@echo installing $(OBJDIR_NORMAL_LIB) in $(install_lib_dir)
-	$(INSTALL_DATA) $(OBJDIR_NORMAL_LIB) $(install_lib_dir)
-	$(RANLIB) $(install_lib_dir)/$(NORMAL_LIB)
+	$(LIBTOOL) --mode=install $(INSTALL_DATA) $(OBJDIR_NORMAL_LIB) $(install_lib_dir)
 	@echo installing slang.h and slcurses.h in $(install_include_dir)
 	$(INSTALL_DATA) $(SRCDIR)/slang.h $(install_include_dir)
 	$(INSTALL_DATA) $(SRCDIR)/slcurses.h $(install_include_dir)