r=a=edburns Bug=52183 git-svn-id: svn://10.0.0.236/trunk@79243 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -85,8 +85,15 @@ else
|
||||
EXTRA_DSO_LDOPTS += -lwc_share
|
||||
endif
|
||||
|
||||
|
||||
ifeq ($(OS_ARCH),Linux)
|
||||
INCLUDES := -I$(JDKHOME)/include -I$(JDKHOME)/include/linux $(INCLUDES) \
|
||||
-I$(DEPTH)/widget/src/gtk -I../src_share
|
||||
else
|
||||
INCLUDES := -I$(JDKHOME)/include -I$(JDKHOME)/include/solaris $(INCLUDES) \
|
||||
-I$(DEPTH)/widget/src/gtk -I../src_share
|
||||
endif
|
||||
|
||||
|
||||
export:: linkSetupRegistry
|
||||
|
||||
|
||||
@@ -47,4 +47,9 @@ EXTRA_DSO_LDOPTS += -L$(DEPTH)/dist/lib -lgtkxtbin -lgtksuperwin -L/usr/X11R6/li
|
||||
endif
|
||||
endif
|
||||
|
||||
# check for OS type
|
||||
ifeq ($(OS_ARCH),Linux)
|
||||
INCLUDES := -I$(JDKHOME)/include -I$(JDKHOME)/include/linux -I.. -I../../src_share $(INCLUDES)
|
||||
else
|
||||
INCLUDES := -I$(JDKHOME)/include -I$(JDKHOME)/include/solaris -I.. -I../../src_share $(INCLUDES)
|
||||
endif
|
||||
@@ -50,7 +50,11 @@ include $(topsrcdir)/config/rules.mk
|
||||
ifneq ($(BAL_INTERFACE),)
|
||||
INCLUDES := -I../bal -I../bal/solaris $(INCLUDES)
|
||||
else
|
||||
INCLUDES := -I$(JDKHOME)/include -I$(JDKHOME)/include/solaris $(INCLUDES)
|
||||
ifeq ($(OS_ARCH),Linux)
|
||||
INCLUDES := -I$(JDKHOME)/include -I$(JDKHOME)/include/linux $(INCLUDES)
|
||||
else
|
||||
INCLUDES := -I$(JDKHOME)/include -I$(JDKHOME)/include/solaris $(INCLUDES)
|
||||
endif
|
||||
endif
|
||||
|
||||
|
||||
|
||||
@@ -17,7 +17,9 @@
|
||||
#
|
||||
# Contributor(s):
|
||||
# Ed Burns <edburns@acm.org>
|
||||
|
||||
# Macadamian Technologies :
|
||||
# Louis-philippe Gagnon
|
||||
# Jason Mawdsley
|
||||
|
||||
|
||||
# this script must be run in the directory in which it resides.
|
||||
@@ -56,7 +58,14 @@ if ($SEP eq "/") {
|
||||
}
|
||||
|
||||
if ($IS_UNIX) {
|
||||
$BINDIR = $ENV{"PWD"} . $SEP . $ARGV[0];
|
||||
# Under red hat linux $ENV{"PWD"} is undefined,
|
||||
# so it only appends a '/' to argv[0].
|
||||
if ( $ENV{"PWD"} == "" ) {
|
||||
$BINDIR = $ARGV[0];
|
||||
}
|
||||
else {
|
||||
$BINDIR = $ENV{"PWD"} . $SEP . $ARGV[0];
|
||||
}
|
||||
}
|
||||
else {
|
||||
open(CD, "cd |");
|
||||
|
||||
Reference in New Issue
Block a user