From: Andrew Innes <andrewi@gnu.org>
Date: Sun, 17 Dec 2000 23:10:02 +0000 (+0000)
Subject: (install): Copy directories to the correct
X-Git-Tag: emacs-pretest-21.0.95~458
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=605e284f5b430335402cad59b1d627e250408ba2;p=emacs.git

(install): Copy directories to the correct
places.
(real_install): Remove obsolete target.
---

diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index 7106f7a41f9..25b9188af75 100644
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -141,10 +141,16 @@ install: all $(INSTALL_DIR)/bin install-other-dirs-$(SHELLTYPE)
 	- "$(INSTALL_DIR)/bin/addpm" /q
 	- $(DEL) ../same-dir.tst
 	- $(DEL) $(INSTALL_DIR)/same-dir.tst
-	- 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)
+	- 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"
+	$(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 @@ install-other-dirs-SH:
 	$(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
 #