ports/www/apache13-modssl/files/patch-ah
Ralf S. Engelschall 6ff6953fd8 Upgrade to Apache 1.3.22 + mod_ssl 2.8.5
Submitted by: Masahiro TAKEMURA <mastake@msel.t.u-tokyo.ac.jp>
2001-10-22 15:38:49 +00:00

36 lines
1.3 KiB
Text

--- src/modules/ssl/Makefile.tmpl.orig Mon Jan 1 19:48:52 2001
+++ src/modules/ssl/Makefile.tmpl Mon Oct 22 20:45:05 2001
@@ -128,6 +128,11 @@
## END-USER AREA
##
+# This requires special handling to get the correct versions of include files:
+# ../../include/fnmatch.h instead of /usr/include/fnmatch.h
+# /usr/include/openssl/*.h instead of /usr/local/include/openssl.h
+MY_CFLAGS= $(INCLUDES0) $(SSL_CFLAGS) $(INCLUDES1) $(EXTRA_INCLUDES) $(CFLAGS)
+
all: lib
lib: $(LIB)
@@ -144,10 +149,10 @@
.SUFFIXES: .o .lo
.c.o:
- $(CC) -c $(INCLUDES) $(CFLAGS) $(SSL_CFLAGS) $(SSL_VERSION) $<
+ $(CC) -c $(MY_CFLAGS) $(SSL_VERSION) $<
.c.lo:
- $(CC) -c $(INCLUDES) $(CFLAGS) $(CFLAGS_SHLIB) $(SSL_CFLAGS) $(SSL_VERSION) $< && mv $*.o $*.lo
+ $(CC) -c $(MY_CFLAGS) $(CFLAGS_SHLIB) $(SSL_VERSION) $< && mv $*.o $*.lo
clean:
rm -f $(OBJS) $(OBJS_PIC)
@@ -201,7 +206,7 @@
depend:
cp Makefile.tmpl Makefile.tmpl.bak \
&& sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl > Makefile.new \
- && gcc -MM $(INCLUDES) $(CFLAGS) $(SSL_CFLAGS) *.c >> Makefile.new \
+ && gcc -MM $(MY_CFLAGS) *.c >> Makefile.new \
&& sed -e '1,$$s; $(INCDIR)/; $$(INCDIR)/;g' \
-e '1,$$s; $(OSDIR)/; $$(OSDIR)/;g' \
-e '1,$$s;^\([a-z0-9_]*\)\.o:;\1.o \1.lo:;g' Makefile.new \