--- Makefile.in.orig	Tue Sep 10 15:27:25 2002
+++ Makefile.in	Thu Sep 19 10:54:38 2002
@@ -22,7 +22,6 @@
 ### Makefile commands
 SHELL     = /bin/sh
 MAIN      =
-CC        = gcc 
 CFLAGS    = __CFLAGS__
 # threads
 LFLAGS    = __LFLAGS__ __LFLAGS2__ __LFLAGS3__
@@ -50,7 +49,7 @@
 MAINBIN = httrack.c
 
 BOUTPUT     = httrack
-BOUTPUTSO   = libhttrack.so
+BOUTPUTSO   = libhttrack.so.1
 DOCS      = ../HelpHtml ../templates ../httrack-doc.html ../COPYING ../INSTALL ../README ../*.txt
 HTSSYSTEM = htssystem.h
 BINPATH   = __BINPATH__
@@ -346,7 +345,8 @@
 	chmod 755 $(BOUTPUT)
 
 build_binso : $(SOBINARIES)
-	$(CC) $(CFLAGS) -shared -Wl,-x,-soname,$(BOUTPUTSO) -o $(BOUTPUTSO) $(SOBINARIES) -lc $(LFLAGS)
+	$(CC) $(CFLAGS) -shared -Wl,-x,-soname,$(BOUTPUTSO) -o $(BOUTPUTSO) $(SOBINARIES) $(LFLAGS)
+	/bin/ln -sf $(BOUTPUTSO) libhttrack.so
 	$(CC) -L. -lhttrack $(MAINBIN) -o $(BOUTPUT)
 	chmod 755 $(BOUTPUT)
 
@@ -378,12 +378,12 @@
 
 # Install docs
 docinstall :
-	(mkdir -p "$(PREFIX)/doc/httrack" && chmod 755 "$(PREFIX)/doc/httrack") || true
-	cp -fR $(DOCS) "$(PREFIX)/doc/httrack/"
+	(mkdir -p "$(PREFIX)/share/doc/httrack" && chmod 755 "$(PREFIX)/share/doc/httrack") || true
+	cp -fR $(DOCS) "$(PREFIX)/share/doc/httrack/"
 
 # Uninstall docs
 docremove :
-	rm -rf "$(PREFIX)/doc/httrack"
+	rm -rf "$(PREFIX)/share/doc/httrack"
 
 # Install binaries and conf files
 bininstall :
@@ -401,7 +401,7 @@
 	test ! -d  "$(LIBPATH)" && (mkdir -p "$(LIBPATH)" && chmod 755 "$(LIBPATH)") || true
 	cp -f $(BOUTPUTSO) $(LIBPATH)/
 	chmod 644 $(LIBPATH)/$(BOUTPUTSO)
-	ln -sf "$(BOUTPUTSO)" "$(PREFIX)/lib/$(BOUTPUTSO).1"
+	ln -sf "$(BOUTPUTSO)" "$(PREFIX)/lib/libhttrack.so"
 
 
 # Uninstall binaries