summaryrefslogtreecommitdiff
path: root/nt
diff options
context:
space:
mode:
authorAndrew Innes <andrewi@gnu.org>2000-12-17 23:10:02 +0000
committerAndrew Innes <andrewi@gnu.org>2000-12-17 23:10:02 +0000
commit605e284f5b430335402cad59b1d627e250408ba2 (patch)
tree0acabfcffacc2f6561aff10771012db468a5d557 /nt
parentb0228ace9ea0bb5d752df7aa128566171d0d4793 (diff)
downloademacs-605e284f5b430335402cad59b1d627e250408ba2.tar.gz
(install): Copy directories to the correct
places. (real_install): Remove obsolete target.
Diffstat (limited to 'nt')
-rw-r--r--nt/makefile.w32-in28
1 files changed, 9 insertions, 19 deletions
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
#