Always make NEWS

diff --git a/releasetools/Targets.mk b/releasetools/Targets.mk
index 4bd50e54dc6d51469dffbea7eb66eefb592bde43..e3610c4a8e92670f09039d9db47c940202e85cf5 100644 (file)
--- a/releasetools/Targets.mk
+++ b/releasetools/Targets.mk
@@ -38,8 +38,17 @@ ifeq ($(DIFFVER),)
        exit 1
 else
 ifeq ($(NEXTVER),$(RELVER))
-       cvs tag $(TAGVER)
-       $(MAKE) DIFFVER=$(DIFFVER) distrib
+       read -s -n1 -p "OK to create cvs tag $(TAGVER)? [No] "; \
+           echo "$$REPLY"; \
+           case $$REPLY in \
+             [yY]) \
+             cvs tag $(TAGVER); \
+             $(MAKE) DIFFVER=$(DIFFVER) distrib; \
+             ;; \
+             *) echo "OK, exiting without making creating tag."; \
+             exit \
+             ;; \
+           esac
 else
        @echo "VERSION $(RELVER) doesn't match specified version $(NEXTVER)."
        exit 1
@@ -143,7 +152,7 @@ endif
 endif
 
 install: zip
-       -$(FTP) $(FTP_OPTS) "mput -O $(SF_UPLOAD_DIR) $(TMP)/docbook-$(DISTRO)-$(ZIPVER).*; quit" $(SF_UPLOAD_HOST)
+       -$(FTP) $(FTP_OPTS) "mput -O $(SF_UPLOAD_DIR) $(TMP)/docbook-$(DISTRO)-*-$(ZIPVER).*; quit" $(SF_UPLOAD_HOST)
        $(SCP) $(SCP_OPTS) $(TMP)/docbook-$(DISTRO)-$(ZIPVER).tar.bz2 $(PROJECT_USER)@$(PROJECT_HOST):$(RELEASE_DIR)/$(DISTRO)/
        $(SSH) $(SSH_OPTS)-l $(PROJECT_USER) $(PROJECT_HOST) \
          "(\

diff --git a/releasetools/install.sh b/releasetools/install.sh
index 9dba87d0b111dff690bba18a1cb34298a714969b..60bc81310212ba7a3ca13dd3b100c327e6a8fd31 100755 (executable)
--- a/releasetools/install.sh
+++ b/releasetools/install.sh
@@ -358,7 +358,7 @@ done <<EOF
   'nxml-mode-hook
   (lambda ()
     (setq rng-schema-locating-files-default
-          (append '("\$thisLocatingRules")
+          (append '("$thisLocatingRules")
                   rng-schema-locating-files-default ))))
 EOF