From bb78ba223ccd99f846198b3a29c7be9e7a4c9f7a Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@anl.gov>
Date: Fri, 18 Apr 2025 17:49:03 -0500
Subject: [PATCH] Don't rely on EPICS_DEV_SNAPSHOT being "-DEV"

---
 documentation/Makefile      | 5 +++--
 documentation/make-notes.pl | 7 +++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/documentation/Makefile b/documentation/Makefile
index b8b3c54eb..d0a525f96 100644
--- a/documentation/Makefile
+++ b/documentation/Makefile
@@ -34,8 +34,9 @@ include $(TOP)/configure/RULES
 MAKENOTES = ../make-notes.pl
 $(COMMON_DIR)/RELEASE_NOTES.md: $(NEW_NOTES) $(MAKENOTES)
 	@$(RM) $@
-	$(PERL) $(MAKENOTES) -o $@ $(EPICS_DEV_SNAPSHOT) \
-	    -V $(EPICS_SHORT_VERSION) -d $(abspath $(NEW_DIR))
+	$(PERL) $(MAKENOTES) -o $@ -D -V $(EPICS_SHORT_VERSION) \
+	    -d $(abspath $(NEW_DIR))
+
 
 $(HEADER_MD_FILES): %_h.md: ../HEADER_h.md
 	$(EXPAND_TOOL) -t $(INSTALL_LOCATION) -DHEADER=$* $< $@
diff --git a/documentation/make-notes.pl b/documentation/make-notes.pl
index 0296821ba..ed95521c4 100644
--- a/documentation/make-notes.pl
+++ b/documentation/make-notes.pl
@@ -25,7 +25,7 @@ sub HELP_MESSAGE {
 }
 
 HELP_MESSAGE()
-    if !getopts('hd:o:D:V:') || $opt_h || @ARGV > 0;
+    if !getopts('hd:o:DV:') || $opt_h || @ARGV > 0;
 
 die "$tool: Directory from '-d' option doesn't exist\n"
     unless -d $opt_d;
@@ -39,6 +39,9 @@ $SIG{__DIE__} = sub {
     unlink $opt_o;
 };
 
+my $REL_VERS = $opt_V;
+$REL_VERS .= '-DEV' if $opt_D;
+
 # Directory handle for scanning the new-notes directory
 opendir my $dh, $opt_d or
     die "$tool: Can't open '-d' directory: $!\n";
@@ -74,7 +77,7 @@ in future releases.
 
 __REL_INTRO__
 
-print $out "## EPICS Release $opt_V\n\n";
+print $out "## EPICS Release $REL_VERS\n\n";
 
 print $out <<__NEW_INTRO__ if $opt_D;
 __This version of EPICS has not been released yet.__