summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorcleeland <cleeland@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2004-08-26 04:35:55 +0000
committercleeland <cleeland@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2004-08-26 04:35:55 +0000
commit4d9bdbad34bf9a1792f6529c68b94ae818cb988b (patch)
tree89e9bc9ac68f6012dd5adb0f56e727a6f129364d /include
parent664ee54af2700872ceb95db3c5ed3b5c0fb9254b (diff)
downloadATCD-4d9bdbad34bf9a1792f6529c68b94ae818cb988b.tar.gz
Wed Aug 25 23:31:02 2004 Chris Cleeland <cleeland_c@ociweb.com>
Diffstat (limited to 'include')
-rw-r--r--include/makeinclude/platform_linux.GNU3
-rw-r--r--include/makeinclude/platform_sunos5_sunc++.GNU4
2 files changed, 3 insertions, 4 deletions
diff --git a/include/makeinclude/platform_linux.GNU b/include/makeinclude/platform_linux.GNU
index 16f220337da..cbc26622554 100644
--- a/include/makeinclude/platform_linux.GNU
+++ b/include/makeinclude/platform_linux.GNU
@@ -47,8 +47,7 @@ PLATFORM_WX_LIBS = $(shell wx-config --libs) $(PLATFORM_GTK_LIBS)
PLATFORM_WX_LDFLAGS = $(shell wx-config --ldflags) $(PLATFORM_GTK_LDFLAGS)
PLATFORM_AIO_SUPPORT := \
- $(shell test "`ls -L /usr/lib/librt.so* /lib/librt.so*`" && echo -DACE_
-HAS_AIO_CALLS)
+ $(shell test "`ls -L /usr/lib/librt.so* /lib/librt.so*`" && echo -DACE_HAS_AIO_CALLS)
ssl ?= 0
ifeq ($(ssl),1)
diff --git a/include/makeinclude/platform_sunos5_sunc++.GNU b/include/makeinclude/platform_sunos5_sunc++.GNU
index 56ba08da116..0e32bec299c 100644
--- a/include/makeinclude/platform_sunos5_sunc++.GNU
+++ b/include/makeinclude/platform_sunos5_sunc++.GNU
@@ -214,9 +214,9 @@ endif # ! exceptions
LD = $(CXX)
ifeq ($(distrib),0)
- LDFLAGS += -R $(ACE_ROOT)/ace -R./
+ LDFLAGS += -R $(ACE_ROOT)/lib -R./
endif
- LIBS += -lsocket -ldl -lnsl -lgen -lposix4
+ LIBS += -lsocket -ldl -lnsl -lgen -lposix4 -ladm
LDFLAGS += -xildoff