# HG changeset patch
# User Andrew Innes <andrewi@gnu.org>
# Date 977094602 0
# Node ID 03059a61bb115b89c36a6b76ff2e3cb86363b5d1
# Parent  4f3649f92e42016b84e9bd2aada203a5a070ce3b
(install): Copy directories to the correct
places.
(real_install): Remove obsolete target.

diff -r 4f3649f92e42 -r 03059a61bb11 nt/makefile.w32-in
--- a/nt/makefile.w32-in	Sun Dec 17 15:11:56 2000 +0000
+++ b/nt/makefile.w32-in	Sun Dec 17 23:10:02 2000 +0000
@@ -141,10 +141,16 @@
 	- "$(INSTALL_DIR)/bin/addpm" /q
 	- $(DEL) ../same-dir.tst
 	- $(DEL) $(INSTALL_DIR)/same-dir.tst
+	echo SameDirTest > "$(INSTALL_DIR)/same-dir.tst"
+	- mkdir "$(INSTALL_DIR)/etc"
+	- mkdir "$(INSTALL_DIR)/info"
+	- mkdir "$(INSTALL_DIR)/lock"
+	- mkdir "$(INSTALL_DIR)/data"
+	- mkdir "$(INSTALL_DIR)/site-lisp"
 	- mkdir "$(INSTALL_DIR)/etc/icons"
-	- $(CP_DIR) icons $(INSTALL_DIR)/etc/icons
-	echo SameDirTest > "$(INSTALL_DIR)/same-dir.tst"
-	$(IFNOTSAMEDIR) $(MAKE) $(MFLAGS) real_install $(ENDIF)
+	$(IFNOTSAMEDIR) $(CP_DIR) ../etc $(INSTALL_DIR) $(ENDIF)
+	- $(CP_DIR) icons $(INSTALL_DIR)/etc
+	$(IFNOTSAMEDIR) $(CP_DIR) ../info $(INSTALL_DIR) $(ENDIF)
 	- $(DEL) ../same-dir.tst
 	- $(DEL) $(INSTALL_DIR)/same-dir.tst
 
@@ -165,22 +171,6 @@
 	$(MAKE) $(MFLAGS) -C ../lisp install
 	$(MAKE) $(MFLAGS) -C ../leim install
 
-real_install:
-	- $(DEL) ../same-dir.tst
-	- $(DEL) $(INSTALL_DIR)/same-dir.tst
-	echo SameDirTest > $(INSTALL_DIR)/same-dir.tst
-	- mkdir "$(INSTALL_DIR)/etc"
-	- mkdir "$(INSTALL_DIR)/info"
-	- mkdir "$(INSTALL_DIR)/lock"
-	- mkdir "$(INSTALL_DIR)/data"
-	- mkdir "$(INSTALL_DIR)/site-lisp"
-	- mkdir "$(INSTALL_DIR)/etc/icons"
-	- $(CP_DIR) icons $(INSTALL_DIR)/etc/icons
-	$(IFNOTSAMEDIR) $(CP_DIR) ../etc $(INSTALL_DIR)/etc $(ENDIF)
-	$(IFNOTSAMEDIR) $(CP_DIR) ../info $(INSTALL_DIR)/info $(ENDIF)
-	- $(DEL) ../same-dir.tst
-	- $(DEL) $(INSTALL_DIR)/same-dir.tst
-
 #
 # Maintenance
 #