summaryrefslogtreecommitdiff
path: root/src/Makefile
diff options
context:
space:
mode:
authorfourdan2007-02-12 16:20:18 +0000
committerfourdan2007-02-12 16:20:18 +0000
commit1ff159be660ab359dc92b9f5f3b4208b284b3924 (patch)
treee689bdd2d4cafb52034f78403f88295cd453488e /src/Makefile
parent68e3c0ed570ba3e994f8a1c4b20594372fb0b514 (diff)
downloadivy-c-1ff159be660ab359dc92b9f5f3b4208b284b3924.zip
ivy-c-1ff159be660ab359dc92b9f5f3b4208b284b3924.tar.gz
ivy-c-1ff159be660ab359dc92b9f5f3b4208b284b3924.tar.bz2
ivy-c-1ff159be660ab359dc92b9f5f3b4208b284b3924.tar.xz
Include patch from Michel Estienne <estienne@tls.cena.fr>
Diffstat (limited to 'src/Makefile')
-rw-r--r--src/Makefile13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/Makefile b/src/Makefile
index 26789d0..b9d0987 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -28,10 +28,12 @@ else
endif
ifndef PREFIX
- PREFIX=/usr/local
+ PREFIX=/usr/local
endif
-X11_PREFIX = /usr
+ifndef X11_PREFIX
+ X11_PREFIX = /usr
+endif
XTINC = -I$(X11_PREFIX)/include
XTLIB = -L$(X11_PREFIX)$(LIB) -lXt -lX11 -lSM -lICE
@@ -71,8 +73,11 @@ endif
#PCREOBJ = `pcre-config --prefix`/lib/libpcre.a
PCREOBJ =
-EXTRALIB=
-#EXTRALIB=-lsocket -lnsl # for solaris
+ifeq ($(shell uname -s),SunOS)
+ EXTRALIB=-lsocket -lnsl # for solaris
+else
+ EXTRALIB=
+endif
CC=gcc
LIBTOOL=ar q # linux and solaris