[Jboss-svn-commits] JBL Code SVN: r4557 - in labs/jbossweb/trunk/src: share/native windows/native/service/jbosssvc

[<jbo...@li...>]

Author: mla...@jb...
Date: 2006-06-02 03:22:10 -0400 (Fri, 02 Jun 2006)
New Revision: 4557

Modified:
   labs/jbossweb/trunk/src/share/native/NMAKEmakefile
   labs/jbossweb/trunk/src/windows/native/service/jbosssvc/NMAKEmakefile
   labs/jbossweb/trunk/src/windows/native/service/jbosssvc/jboss.c
Log:
Fix service runner.

Modified: labs/jbossweb/trunk/src/share/native/NMAKEmakefile
===================================================================
--- labs/jbossweb/trunk/src/share/native/NMAKEmakefile	2006-06-02 06:08:22 UTC (rev 4556)
+++ labs/jbossweb/trunk/src/share/native/NMAKEmakefile	2006-06-02 07:22:10 UTC (rev 4557)
@@ -131,8 +131,8 @@
 	@$(CLEANTARGET)
 
 !IFNDEF INSTALLDIR
-INSTALLDIR = ../native-builds/windows-%CPU%/bin/native
-INSTALLLOC = ..\native-builds\windows-%CPU%\bin\native
+INSTALLDIR = ../native-builds/windows-$(CPU)/bin/native
+INSTALLLOC = ..\native-builds\windows-$(CPU)\bin\native
 !ENDIF
 
 !IFDEF STATIC
@@ -143,7 +143,7 @@
 
 !ELSE
 install: all
-    @gmkdir -p $(INSTALLDIR)
+	@gmkdir -p $(INSTALLDIR)
 	@cp -f -t $(INSTALLDIR) $(BUILDLIB)
 	@cp -f -t $(INSTALLDIR) $(WITH_OPENSSL)/out32dll/openssl.exe
 	@cp -f -t $(INSTALLDIR) $(WITH_OPENSSL)/out32dll/libeay32.dll

Modified: labs/jbossweb/trunk/src/windows/native/service/jbosssvc/NMAKEmakefile
===================================================================
--- labs/jbossweb/trunk/src/windows/native/service/jbosssvc/NMAKEmakefile	2006-06-02 06:08:22 UTC (rev 4556)
+++ labs/jbossweb/trunk/src/windows/native/service/jbosssvc/NMAKEmakefile	2006-06-02 07:22:10 UTC (rev 4557)
@@ -63,9 +63,9 @@
 	@$(CLEANTARGET)
 
 !IFNDEF INSTALLDIR
-INSTALLDIR = ../../native-builds/windows-%CPU%/bin
+INSTALLDIR = ../../native-builds/windows-$(CPU)/bin
 !ENDIF
 
 install: all
-    @gmkdir -p $(INSTALLDIR)
+	@gmkdir -p $(INSTALLDIR)
 	@cp -f -t $(INSTALLDIR) $(BUILDEXE)

Modified: labs/jbossweb/trunk/src/windows/native/service/jbosssvc/jboss.c
===================================================================
--- labs/jbossweb/trunk/src/windows/native/service/jbosssvc/jboss.c	2006-06-02 06:08:22 UTC (rev 4556)
+++ labs/jbossweb/trunk/src/windows/native/service/jbosssvc/jboss.c	2006-06-02 07:22:10 UTC (rev 4557)
@@ -787,7 +787,7 @@
         lstrcpy(_working_path, argv[i++]);
         /* Remove trailing backslash */
         if (l > 0 && _working_path[l - 1] == '\\')
-            _working_path[l - 1] == '\0'        
+            _working_path[l - 1] = '\0';
     }
     if (need_disp)
         lstrcpy(_service_disp, argv[i++]);