summaryrefslogtreecommitdiff
path: root/devel/pwlib/patches/patch-aa
blob: 3b1c57723aafbe939147762101985c9ebfaf0136 (plain)
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
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
$NetBSD: patch-aa,v 1.5 2004/10/08 22:31:02 mjl Exp $

--- make/unix.mak.orig	2003-07-25 00:01:42.000000000 +0200
+++ make/unix.mak	2004-10-09 00:28:36.000000000 +0200
@@ -66,13 +66,13 @@
 #
 
 ifndef PWLIBDIR
-PWLIBDIR = $(HOME)/pwlib
+PWLIBDIR = /usr/pkg
 endif
 
 ####################################################
 
 # include generated build options file, then include it
-include $(PWLIBDIR)/make/ptbuildopts.mak
+include $(PWLIBDIR)/share/pwlib/make/ptbuildopts.mak
 
 ###############################################################################
 #
@@ -381,9 +381,9 @@
 
 ifeq ($(OSTYPE),OpenBSD)
 
-ifeq ($(MACHTYPE),x86)
-STDCCFLAGS	+= -m486
-endif
+# ifeq ($(MACHTYPE),x86)
+# STDCCFLAGS	+= -m486
+# endif
 
 LDLIBS		+= -lossaudio
 
@@ -404,9 +404,9 @@
 
 ifeq ($(OSTYPE),NetBSD)
 
-ifeq ($(MACHTYPE),x86)
-STDCCFLAGS	+= -m486
-endif
+# ifeq ($(MACHTYPE),x86)
+# STDCCFLAGS	+= -m486
+# endif
 
 ifndef OSRELASE
 OSRELEASE   := $(shell /sbin/sysctl -n kern.osrevision)
@@ -853,7 +853,7 @@
 endif
 
 ifeq ($(P_SHAREDLIB),1)
-LIB_SUFFIX	= $(SHAREDLIBEXT)
+LIB_SUFFIX	= la
 else   
 LIB_SUFFIX	= a 
 ifndef DEBUG
@@ -865,8 +865,9 @@
 LIB_TYPE	=
 endif
 
+INSTALL_DIR = ${PREFIX}
 ifndef INSTALL_DIR
-INSTALL_DIR	= /usr/local
+INSTALL_DIR	= /usr/pkg
 endif
 
 ifndef INSTALLBIN_DIR
@@ -891,11 +892,11 @@
 
 # Directories
 
-ifdef PREFIX
-UNIX_INC_DIR	= $(PREFIX)/include/ptlib/unix
-else
+#ifdef PREFIX
+#UNIX_INC_DIR	= $(PREFIX)/include/ptlib/unix
+#else
 UNIX_INC_DIR	= $(PWLIBDIR)/include/ptlib/unix
-endif
+#endif
 
 ifndef UNIX_SRC_DIR
 UNIX_SRC_DIR	= $(PWLIBDIR)/src/ptlib/unix
@@ -904,7 +905,7 @@
 PW_LIBDIR	= $(PWLIBDIR)/lib
 
 # set name of the PT library
-PTLIB_BASE	= pt_$(PLATFORM_TYPE)_$(OBJ_SUFFIX)
+PTLIB_BASE	= pt
 PTLIB_FILE	= lib$(PTLIB_BASE)$(LIB_TYPE).$(LIB_SUFFIX)
 PT_OBJBASE	= obj_$(PLATFORM_TYPE)_$(OBJDIR_SUFFIX)
 PT_OBJDIR	= $(PW_LIBDIR)/$(PT_OBJBASE)
@@ -972,6 +973,6 @@
 # add library directory to library path and include the library
 LDFLAGS		+= -L$(PW_LIBDIR)
 
-LDLIBS		+= -l$(PTLIB_BASE)$(LIB_TYPE)
+LDLIBS		+= $(PW_LIBDIR)/$(PTLIB_FILE)
 
 # End of unix.mak