summaryrefslogtreecommitdiff
path: root/www/ap-aolserver/patches/patch-aa
blob: 5988ce79dad1cacbc3a1b3e86df78a0604f971e9 (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
$NetBSD: patch-aa,v 1.2 2001/08/21 17:26:08 cjones Exp $

--- Makefile.in.orig	Sat Oct  7 12:44:37 2000
+++ Makefile.in	Sat Aug 18 13:53:04 2001
@@ -7,7 +7,7 @@
 APACHE_BASE      = @APACHE_BASE@
 APXS             = @APXS@
 CC               = @CC@
-CFLAGS           = -I. @CFLAGS@ -DORA8_DRIVER_VERSION=\"2.3\"
+CFLAGS           = -I. @CFLAGS@ -DORA8_DRIVER_VERSION=\"2.3\" -fPIC
 CPPFLAGS         = -DDB_DRIVER_NAME=\"$(DBNAME)\" @CPPFLAGS@
 DBNAME           = @DBNAME@
 INSTALL          = @INSTALL@
@@ -25,7 +25,7 @@
 
 BOOTSTRAP_MAIN_DIR  = $(APACHE_BASE)/libexec
 BOOTSTRAP_OTHER_DIR = $(BOOTSTRAP_MAIN_DIR)/aol_bootstrap
-TCL_MODULE_DIR      = $(APACHE_BASE)/tcl_modules
+TCL_MODULE_DIR      = $(APACHE_BASE)/etc/httpd/tcl_modules
 
 ################################################################
 
@@ -62,7 +62,7 @@
 
 TCL_SRCS = \
     tcl_modules/README tcl_modules/form.tcl \
-    tcl_modules/http.tcl tcl_modules/nsd.ini.sample tcl_modules/nsdb.tcl \
+    tcl_modules/http.tcl tcl_modules/nsdb.tcl \
     tcl_modules/sendmail.tcl tcl_modules/util.tcl
 
 MISCFILES = \
@@ -78,14 +78,14 @@
 
 BUILD_MODULE = $(APXS) -c $(LIBS)
 
-INSERT_MODULE = $(APXS) -i -a
+INSERT_MODULE = $(APXS) -i
 
 ########################################################################
 
-all: $(MODULE_FILE) install
+all: $(MODULE_FILE)
 
 $(MODULE_FILE): $(OBJS)
-	$(APXS) -c -o $@ $(OBJS) $(LIBS)
+	$(APXS) -c -o $@ $(OBJS) `echo $(LIBS) | sed 's/-Wl,//'`
 
 install: install-mod_aolserver install-bootstrap install-tcl