--- src/Makefile.in.orig	Sun Jan  9 14:38:29 2000
+++ src/Makefile.in	Sat Mar 25 11:04:23 2000
@@ -2,8 +2,8 @@
 #---------------------------------------------------------------------------
 # ANSI C compiler
 #---------------------------------------------------------------------------
-CC              = @CC@
-CFLAGS 		= @CFLAGS@
+#CC              = @CC@
+#CFLAGS 	= @CFLAGS@
 LDFLAGS		= @LDFLAGS@ @DYNAMIC_LINK_FLAGS@
 #-----------------------------------------------------------------------------
 # System library that contains functions for dynamic linking (-ldl)
@@ -13,9 +13,9 @@
 #---------------------------------------------------------------------------
 # Compiler for producing a shared library (ELF)
 #---------------------------------------------------------------------------
-ELF_CC 		= @ELF_CC@
-ELF_CFLAGS	= @ELF_CFLAGS@
-ELF_LINK        = @ELF_LINK@
+ELF_CC 		= $(CC)
+ELF_CFLAGS	= $(CFLAGS) -fpic -DPIC
+ELF_LINK        = ld -Bshareable -Bforcearchive
 ELF_DEP_LIBS	= $(DL_LIB) -lm -lc
 
 #---------------------------------------------------------------------------
@@ -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)
@@ -106,11 +106,9 @@
 
 $(ELFDIR_ELF_LIB): $(ELFDIR) $(CONFIG_H) $(ELFOBJS)
 	-$(RM) $(ELFDIR_ELF_LIB)
-	cd $(ELFDIR); $(ELF_LINK_CMD) -o $(ELFLIB_MAJOR_MINOR) $(OFILES) $(ELF_DEP_LIBS)
-	cd $(ELFDIR); $(RM) $(ELFLIB); $(LN) $(ELFLIB_MAJOR_MINOR) $(ELFLIB)
+	cd $(ELFDIR); $(ELF_LINK) -o $(ELFLIB_MAJOR_MINOR) $(OFILES) $(ELF_DEP_LIBS)
 	@echo ""
 	@echo $(ELFLIB_MAJOR_MINOR) created in $(ELFDIR).
-	@echo The link $(ELFLIB) to $(ELFLIB_MAJOR_MINOR) was also created.
 	@echo ""
 $(OBJDIR) :
 	-$(MKDIR) $(OBJDIR)
@@ -144,15 +142,10 @@
 $(install_lib_dir):
 	$(MKINSDIR) $(install_lib_dir)
 install-elf: elf install
-	-$(RM) $(install_lib_dir)/$(ELFLIB)
-	-$(RM) $(install_lib_dir)/$(ELFLIB_MAJOR)
 	@echo installing $(ELFLIB_MAJOR_MINOR) in $(install_lib_dir)
 	$(INSTALL_DATA) $(ELFDIR_ELF_LIB) $(install_lib_dir)
-	@echo creating symbolic links to $(ELFLIB_MAJOR_MINOR)
-	-cd $(install_lib_dir); $(LN) $(ELFLIB_MAJOR_MINOR) $(ELFLIB)
 	@echo ""
 	@echo $(ELFLIB_MAJOR_MINOR) created in $(install_lib_dir).
-	@echo The link $(ELFLIB) to $(ELFLIB_MAJOR_MINOR) was also created.
 	@echo ""
 install-links:
 	-$(RM) $(install_lib_dir)/$(ELFLIB)
