From 4a3c93fba33bcbcf5bbe21441d4c2c9d7f27a5e4 Mon Sep 17 00:00:00 2001
From: dion <dion@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 4 Jul 2004 12:25:15 +0000
Subject: [PATCH] Rename PROJECT_DIST_DIR to PROJECT_DIST_BIN_DIR

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115639 13f79535-47bb-0310-9956-ffa450edef68
---
 nsis/src/plugin-resources/templates/project.jelly | 3 ++-
 nsis/src/plugin-resources/templates/setup.jelly   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/nsis/src/plugin-resources/templates/project.jelly b/nsis/src/plugin-resources/templates/project.jelly
index 4b334d89..31d92f7d 100644
--- a/nsis/src/plugin-resources/templates/project.jelly
+++ b/nsis/src/plugin-resources/templates/project.jelly
@@ -43,7 +43,8 @@
 !define PROJECT_REG_UNINSTALL_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${pom.name} ${pom.version}"
 !define PROJECT_STARTMENU_FOLDER "$$SMPROGRAMS\${pom.organization}\${pom.name} ${pom.currentVersion}"
 !define PROJECT_VERSION "${pom.currentVersion}"
-!define PROJECT_DIST_DIR "${maven.dist.bin.assembly.dir}"
+!define PROJECT_DIST_BIN_DIR "${maven.dist.bin.assembly.dir}"
+!define PROJECT_DIST_DIR "${maven.dist.dir}"
 <j:set var="logo" value="${maven.nsis.logo}"/>
 <j:if test="${!empty(logo)}">
   <maven:makeAbsolutePath var="logo" basedir="${basedir}" path="${maven.nsis.logo}"/>
diff --git a/nsis/src/plugin-resources/templates/setup.jelly b/nsis/src/plugin-resources/templates/setup.jelly
index de0758b8..6df34d3a 100644
--- a/nsis/src/plugin-resources/templates/setup.jelly
+++ b/nsis/src/plugin-resources/templates/setup.jelly
@@ -91,7 +91,7 @@ Section "$${PROJECT_NAME} v$${PROJECT_VERSION} Binaries"
   SetOutPath $$INSTDIR
   ; Put files and directories there
   ; the script will be run from a directory below Maven
-  File /r "$${PROJECT_DIST_DIR}\*.*"
+  File /r "$${PROJECT_DIST_BIN_DIR}\*.*"
 
   ; Write the installation path into the registry
   WriteRegStr HKLM "$${PROJECT_REG_KEY}" "Install_Dir" "$$INSTDIR"