--- src/Makefile.tmpl.orig	Thu Aug 19 07:33:07 1999
+++ src/Makefile.tmpl	Sat Jan 27 08:10:08 2001
@@ -14,7 +14,6 @@
 
 
 !directory common all,clean,install
-!directory regexp all,clean,install
 !directory msql all,clean,install
 
 !directory lang-common all,clean,install
@@ -31,19 +30,19 @@
 	echo
 
 install ::
-	@cp -r ../../doc/* $(INST_DIR)/doc; \\
-	cp -r ../../demos/w3-msql/* $(INST_DIR)/www; \\
-	cp -r ../../misc/setup_* $(INST_DIR)/misc; \\
-	cp ../../README* $(INST_DIR);\\
-	cp makegen/* $(INST_DIR)/makegen;\\
-	chmod 755 $(INST_DIR)/makegen/*;\\
-	cp site.mm $(INST_DIR)/makegen;\\
-        if test -f $(INST_DIR)/msql.conf;\
+	@cp -r ../../doc/* $(INST_DIR)/share/doc/msql; \\
+	cp -r ../../demos/w3-msql/* $(INST_DIR)/share/msql/www; \\
+	cp -r ../../misc/setup_* $(INST_DIR)/share/msql/misc; \\
+	cp ../../README* $(INST_DIR)/share/doc/msql;\\
+	cp makegen/* $(INST_DIR)/share/msql/makegen;\\
+	chmod 755 $(INST_DIR)/share/msql/makegen/*;\\
+	cp site.mm $(INST_DIR)/share/msql/makegen;\\
+        if test -f $(INST_DIR)/etc/msql2/msql.conf;\
         then\
-                rm -f $(INST_DIR)/msql.conf.old;\
-                mv $(INST_DIR)/msql.conf $(INST_DIR)/msql.conf.old;\
+                rm -f $(INST_DIR)/etc/msql2/msql.conf.old;\
+                mv $(INST_DIR)/etc/msql2/msql.conf $(INST_DIR)/etc/msql2/msql.conf.old;\
         fi;\
-	sed "s,_INST_,$(INST_DIR),"< ../../misc/msql.conf >$(INST_DIR)/msql.conf;\\
+	sed "s,_INST_,$(INST_DIR),"< ../../misc/msql.conf >$(INST_DIR)/etc/msql2/msql.conf;\\
 	echo ;\\
 	echo ;\\
 	echo ;\\
