(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 7106f7a41f91db9854888e7c0d3aaec2db533d74..25b9188af75e3723bf3464beddd4de8dfe39a1d5 100644 (file)
--- 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
 #