From: Michael Smith <xmldoc@users.sourceforge.net>
Date: Mon, 27 Jun 2005 10:41:17 +0000 (+0000)
Subject: Always make NEWS
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5a7bb2d28fcec7af199507d2a0a3012757b98d6a;p=docbook-dsssl

Always make NEWS
---

diff --git a/releasetools/Targets.mk b/releasetools/Targets.mk
index 4bd50e54d..e3610c4a8 100644
--- 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 9dba87d0b..60bc81310 100755
--- 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