--- src/msql/Makefile.tmpl.orig	Thu Aug 19 07:33:13 1999
+++ src/msql/Makefile.tmpl	Sun Jan 28 00:11:52 2001
@@ -34,57 +34,59 @@
 
 !dll_os2 msql libmsql.c,net.c,config.c,time.c ../common/strlib.o,../common/tmpnam.o,../common/strerror.o,../common/strptime.o,../common/snprintf.o
 !library_unix libmsql.a libmsql.c,net.c,config.c,time.c ../common/strlib.o,../common/tmpnam.o,../common/strerror.o,../common/strptime.o,../common/snprintf.o
-
-all: ../lib/libmsql.a
-
-../lib/libmsql.a : libmsql.a
-	rm -f ../lib/libmsql.a
-	cp ../msql/libmsql.a ../lib/libmsql.a
-	$(RANLIB) ../lib/libmsql.a
+!slibrary_unix 1 libmsql.so libmsql.c,net.c,config.c,time.c ../common/strlib.o,../common/tmpnam.o,../common/strerror.o,../common/strptime.o,../common/snprintf.o
 
 
 !object msqladmin.o msqladmin.c
-!program msqladmin msqladmin.o,acl.o,libmsql.a
+!program msqladmin msqladmin.o,acl.o -L.,-lmsql
+msqladmin: libmsql.so
 
 !object msql.o msql.c
-!program msql msql.o,libmsql.a
+!program msql msql.o -L.,-lmsql
+msql: libmsql.so
 
 !object msqldump.o msqldump.c
-!program msqldump msqldump.o,libmsql.a
+!program msqldump msqldump.o -L.,-lmsql
+msqldump: libmsql.so
 
 !object msqlexport.o msqlexport.c
-!program msqlexport msqlexport.o,libmsql.a
+!program msqlexport msqlexport.o -L.,-lmsql
+msqlexport: libmsql.so
 
 !object msqlimport.o msqlimport.c
-!program msqlimport msqlimport.o,libmsql.a
+!program msqlimport msqlimport.o -L.,-lmsql
+msqlimport: libmsql.so
 
 !object relshow.o relshow.c 
-!program relshow relshow.o,libmsql.a
+!program relshow relshow.o -L.,-lmsql
+relshow: libmsql.so
 
 !object insert_test.o insert_test.c 
-!program insert_test insert_test.o,libmsql.a
+!program insert_test insert_test.o -L.,-lmsql
+insert_test: libmsql.so
 
 !object select_test.o select_test.c 
-!program select_test select_test.o,libmsql.a
-
-!program msql2d msqld.o,msql_yacc.o,msql_lex.o,msql_proc.o,net.o,msqldb.o,acl.o,index.o,types.o,regex.o,varchar.o,memory.o,table.o,select.o,cra.o,sort.o,distinct.o,sysvar.o,funct.o,avl_tree.o ../common/debug.o,../common/strtoul.o,-lregexp,libmsql.a
+!program select_test select_test.o -L.,-lmsql
+select_test: libmsql.so
 
-msql2d: libmsql.a
+!program msql2d msqld.o,msql_yacc.o,msql_lex.o,msql_proc.o,net.o,msqldb.o,acl.o,index.o,types.o,regex.o,varchar.o,memory.o,table.o,select.o,cra.o,sort.o,distinct.o,sysvar.o,funct.o,avl_tree.o ../common/debug.o,../common/strtoul.o,-lcompat,-L.,-lmsql
+msql2d: libmsql.so
 
 msqld-clean:
 	rm -f msqld.o msql_yacc.o msql_lex.o msql_proc.o net.o \
 	msqldb.o 
 
 !install msql $(INST_DIR)/bin/msql 0755
-!install msql2d $(INST_DIR)/bin/msql2d 0750 $(ROOT)
+!install msql2d $(INST_DIR)/sbin/msql2d 0750 $(ROOT)
 !install msqladmin $(INST_DIR)/bin/msqladmin 0750 $(ROOT)
 !install msqlexport $(INST_DIR)/bin/msqlexport 0750 $(ROOT)
 !install msqlimport $(INST_DIR)/bin/msqlimport 0750 $(ROOT)
 !install relshow $(INST_DIR)/bin/relshow 0755 $(ROOT)
 !install msqldump $(INST_DIR)/bin/msqldump 0755 $(ROOT)
 !libinstall libmsql.a $(INST_DIR)/lib/libmsql.a 744 $(ROOT)
+!slibinstall 1 libmsql.so $(INST_DIR)/lib 744 $(ROOT)
 !install msql.h $(INST_DIR)/include/msql.h 744 $(ROOT)
-!install sample.acl $(INST_DIR)/msql.acl.sample 700 $(ROOT)
+!install sample.acl $(INST_DIR)/etc/msql2/msql.acl.sample 700 $(ROOT)
 
 lextest :: msql_lex.c
 	$(CC) $(CC_FLAGS) -DDEBUG msql_lex.c -o lextest