blob: 7899cece0d0ad1eff8015392a2827a1725d58747 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
|
--- Makefile.defs.orig Thu Dec 20 13:34:23 2007
+++ Makefile.defs Wed Jan 30 14:58:46 2008
@@ -131,7 +131,7 @@
ifeq ($(ARCH_B),64b)
LIBDIR ?= lib64
else
- LIBDIR ?= lib
+ LIBDIR = lib
# assume 32b - it is not really used further
ARCH_B=32b
endif
@@ -211,13 +211,13 @@
TAR ?= tar
endif
-INSTALL_TOUCH = touch # used to create the file first (good to
- # make solaris install work)
-INSTALL_CFG = $(INSTALL) -m 644
-INSTALL_BIN = $(INSTALL) -m 755
-INSTALL_MODULES = $(INSTALL) -m 755
-INSTALL_DOC = $(INSTALL) -m 644
-INSTALL_MAN = $(INSTALL) -m 644
+INSTALL_TOUCH = : # used to create the file first (good to
+ # make solaris install work)
+INSTALL_CFG = $(BSD_INSTALL_DATA)
+INSTALL_BIN = $(BSD_INSTALL_PROGRAM)
+INSTALL_MODULES = $(BSD_INSTALL_PROGRAM)
+INSTALL_DOC = $(BSD_INSTALL_DATA)
+INSTALL_MAN = $(BSD_INSTALL_MAN)
#set some vars from the environment (and not make builtins)
CC := $(shell echo "$${CC}")
@@ -1205,8 +1205,8 @@
#add libssl if needed
ifneq ($(TLS),)
-DEFS+= -I$(LOCALBASE)/ssl/include -I$(LOCALBASE)/include
-LIBS+= -L$(LOCALBASE)/lib -L$(LOCALBASE)/ssl/lib -lssl -lcrypto
+DEFS+= -I$(OPENSSLINC)
+LIBS+= -L$(OPENSSLLIB) -lssl -lcrypto
endif
ifneq ($(found_lock_method), yes)
|
