[Commits] (markie) Seems to work OK now

[commits at osafoundation.org]

Commit by: markie
Modified files:
external/Makefile.inc 1.11 1.12
external/cygenv.sh 1.1 1.2

Log message:
Seems to work OK now


ViewCVS links:
http://cvs.osafoundation.org/index.cgi/external/Makefile.inc.diff?r1=text&tr1=1.11&r2=text&tr2=1.12
http://cvs.osafoundation.org/index.cgi/external/cygenv.sh.diff?r1=text&tr1=1.1&r2=text&tr2=1.2

Index: external/Makefile.inc
diff -u external/Makefile.inc:1.11 external/Makefile.inc:1.12
--- external/Makefile.inc:1.11	Thu Apr 29 14:57:21 2004
+++ external/Makefile.inc	Thu Apr 29 16:20:59 2004
@@ -83,10 +83,6 @@
      else \
 		echo "Setting your environment variables..."; \
 		. $(BUILD_ROOT)/cygenv.sh; \
-		echo "(after exiting cygenv.sh)"; \
-		echo PATH is $(PATH); \
-		echo INCLUDE is $(INCLUDE); \
-		echo LIB is $(LIB);\
 	fi
 else
 	@if [ ! -f $(GCJ_HOME)/bin/gcj ]; then \

Index: external/cygenv.sh
diff -u external/cygenv.sh:1.1 external/cygenv.sh:1.2
--- external/cygenv.sh:1.1	Thu Apr 29 00:04:03 2004
+++ external/cygenv.sh	Thu Apr 29 16:20:59 2004
@@ -12,23 +12,15 @@
 fi
 
 curdir=`pwd`
-#echo $curdir
 
 cd "$VS71COMNTOOLS"
-#echo VS71COMNTOOLS is `pwd`
 cd ../..
-#echo parent of VS71COMNTOOLS is `pwd`
 export COMN7="`pwd`"
-#echo COMN7= $COMN7
 cd ..; export MSVC="`pwd`"
 cd $curdir
-#echo Back in `pwd`
 
-#echo MSVC is $MSVC
 export VSINSTALLDIR="$COMN7/IDE"
-#echo VSINSTALLDIR is $VSINSTALLDIR
 export VCINSTALLDIR="$MSVC"
-#echo VCINSTALLDIR is $VCINSTALLDIR
 
 DevEnvDir=$VSINSTALLDIR
 
@@ -37,12 +29,8 @@
 # Root of Visual C++ installed files.
 #
 MSVCDir=$VCINSTALLDIR/VC7
-#echo MSVCDir is $MSVCDir
 
-export PATH="$DevEnvDir":"$MSVCDir"/BIN:"$VS71COMNTOOLS":"$VS71COMNTOOLS"/bin/prerelease:"$VS71COMNTOOLS"/bin:$PATH
-#echo PATH is $PATH
-export INCLUDE="$MSVCDir"/ATLMFC/INCLUDE:"$MSVCDir"/INCLUDE:"$MSVCDir"/PlatformSDK/include/prerelease:"$MSVCDir"/PlatformSDK/include:$INCLUDE
-#echo INCLUDE is $INCLUDE
-export LIB="$MSVCDir"/ATLMFC/LIB:"$MSVCDir"/LIB:"$MSVCDir"/PlatformSDK/lib/prerelease:"$MSVCDir"/PlatformSDK/lib:$LIB
-#echo LIB is $LIB
+export PATH="$DevEnvDir":"$MSVCDir/BIN":"$VS71COMNTOOLS":"$VS71COMNTOOLS/bin/prerelease":"$VS71COMNTOOLS/bin":"$PATH"
+export INCLUDE="$MSVCDir/ATLMFC/INCLUDE":"$MSVCDir/INCLUDE":"$MSVCDir/PlatformSDK/include/prerelease":"$MSVCDir"/PlatformSDK/include:"$INCLUDE"
+export LIB="$MSVCDir/ATLMFC/LIB":"$MSVCDir/LIB":"$MSVCDir/PlatformSDK/lib/prerelease":"$MSVCDir/PlatformSDK/lib":"$LIB"