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

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

Author: mla...@jb...
Date: 2006-05-10 08:52:30 -0400 (Wed, 10 May 2006)
New Revision: 4182

Modified:
   labs/jbossweb/trunk/src/share/native/NMAKEmakefile
   labs/jbossweb/trunk/src/windows/native/service/jbosssvc/NMAKEmakefile
Log:
Adjust the build native dirs

Modified: labs/jbossweb/trunk/src/share/native/NMAKEmakefile
===================================================================
--- labs/jbossweb/trunk/src/share/native/NMAKEmakefile	2006-05-10 12:47:33 UTC (rev 4181)
+++ labs/jbossweb/trunk/src/share/native/NMAKEmakefile	2006-05-10 12:52:30 UTC (rev 4182)
@@ -131,7 +131,7 @@
 	@$(CLEANTARGET)
 
 !IFNDEF INSTALLDIR
-INSTALLDIR = ../native-builds/$(BUILDIR)
+INSTALLDIR = ../native-builds/windows-%CPU%/bin/native
 !ENDIF
 
 !IFDEF STATIC

Modified: labs/jbossweb/trunk/src/windows/native/service/jbosssvc/NMAKEmakefile
===================================================================
--- labs/jbossweb/trunk/src/windows/native/service/jbosssvc/NMAKEmakefile	2006-05-10 12:47:33 UTC (rev 4181)
+++ labs/jbossweb/trunk/src/windows/native/service/jbosssvc/NMAKEmakefile	2006-05-10 12:52:30 UTC (rev 4182)
@@ -63,12 +63,8 @@
 	@$(CLEANTARGET)
 
 !IFNDEF INSTALLDIR
-!IFDEF FORDLL
-INSTALLDIR = ../../native-builds/WINNT_$(CPU)_DLL_RELEASE
-!ELSE
-INSTALLDIR = ../../native-builds/WINNT_$(CPU)_LIB_RELEASE
+INSTALLDIR = ../../native-builds/windows-%CPU%/bin
 !ENDIF
-!ENDIF
 
 install: all
     @gmkdir -p $(INSTALLDIR)