From 3dfb061cbafd3a97c9359f739942924a8ee525f1 Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Wed, 02 Nov 2011 12:07:15 +0000
Subject: [PATCH] Fix for OPENDJ-222 : Renamed environment variables to OPENDJ_... Updated scripts so that if OPENDJ_JAVA_HOME and OPENDJ_JAVA_ARGS are not defined, we look at the legacy OPENDS_... ones.

---
 opends/src/build-tools/windows/Makefile |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/opends/src/build-tools/windows/Makefile b/opends/src/build-tools/windows/Makefile
index 6dc0df1..94a7aca 100644
--- a/opends/src/build-tools/windows/Makefile
+++ b/opends/src/build-tools/windows/Makefile
@@ -27,11 +27,11 @@
 
 #
 # This is the Makefile than can be used to generate the executables
-# winlauncher.exe and opends_service.exe that are used by OpenDS in
+# winlauncher.exe and opendj_service.exe that are used by OpenDS in
 # windows.
 #
 # The compilation of winlauncher.exe is straightforward but in the case of
-# opends_service.exe uses a Message File called EventLogMsg.mc which
+# opendj_service.exe uses a Message File called EventLogMsg.mc which
 # makes the compilation a little bit more complex.
 # During compilation the first step is to generate EventLogMsg.h and
 # EventLogMsg.res using the rc.exe and mc.exe utilities.
@@ -40,7 +40,7 @@
 # the Windows Event Log and is required in order service.c to be compiled.
 # Once the EvenLogMsg.h file is generated we can compile the service.c and
 # common.c and finally we link the service.obj, common.obj and
-# EventLogMsg.res files and we generate the opends_service.exe executable.
+# EventLogMsg.res files and we generate the opendj_service.exe executable.
 #
 
 CC=cl
@@ -55,7 +55,7 @@
 MC=mc
 MT=mt
 
-SRCS = common.c winlauncher.c service.c 
+SRCS = common.c winlauncher.c service.c
 
 SERVICE_OBJS = common.obj service.obj
 WINLAUNCHER_OBJS = common.obj winlauncher.obj
@@ -73,25 +73,25 @@
 
 .c.obj:
   $(CC) $(CFLAGS) -c $< -Fo$@
-  
+
 $(RES_FILE):
   $(MC) $(MC_FILE)
   $(RC) /fo $(RES_FILE) $(RC_FILE)
 
 
-all: $(SERVICE_PROGNAME) $(WINLAUNCHER_PROGNAME) $(LAUNCHER_ADMINISTRATOR_PROGNAME) 
+all: $(SERVICE_PROGNAME) $(WINLAUNCHER_PROGNAME) $(LAUNCHER_ADMINISTRATOR_PROGNAME)
 
 $(SERVICE_PROGNAME) : $(RES_FILE) $(SERVICE_OBJS)
   $(LINKER) /OUT:$(SERVICE_PROGNAME) $(RES_FILE) $(SERVICE_OBJS) $(LIBS)
   $(MT) -manifest "$(SERVICE_MANIFEST_FILE)" -outputresource:"$(SERVICE_PROGNAME)";#1
-  
+
 $(WINLAUNCHER_PROGNAME) : $(WINLAUNCHER_OBJS)
   $(LINKER) $(WINLAUNCHER_OBJS) /OUT:$(WINLAUNCHER_PROGNAME)
 
 $(LAUNCHER_ADMINISTRATOR_PROGNAME) : $(WINLAUNCHER_OBJS)
   $(LINKER) $(WINLAUNCHER_OBJS) /OUT:$(LAUNCHER_ADMINISTRATOR_PROGNAME)
   $(MT) -manifest "$(LAUNCHER_ADMINISTRATOR_MANIFEST_FILE)" -outputresource:"$(LAUNCHER_ADMINISTRATOR_PROGNAME)";#1
-  
+
 clean:
   del $(SERVICE_OBJS) $(EVENTLOG_H) $(WINLAUNCHER_OBJS) $(RC_FILE) $(RES_FILE) $(SERVICE_PROGNAME) $(WINLAUNCHER_PROGNAME) $(LAUNCHER_ADMINISTRATOR_PROGNAME) core
 

--
Gitblit v1.10.0