httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Wilfredo Sanchez <wsanc...@Apple.Com>
Subject [Patch: Rhapsody port, some make fixes]
Date Sat, 18 Apr 1998 23:47:57 GMT
Below are diffs based on apache 1.2.6.

Fixes are:

 1) Builds on Rhapsody 5.1 (not released yet, will ship with apache 1.2.4)
    May require small tweaks to build on 5.0, but you want 5.1+ in the long run.
    mmap() works in 5.1 but doesn't allow MAP_ANON. I haven't figured out the right
      thing to do about that is, so it's still disabled.
    We install files thusly:
        /System/Library/WebServer/Icons
        /Local/Library/WebServer/CGI-Executables
        /Local/Library/WebServer/Configuration
        /Local/Library/WebServer/Documents
        /Local/Library/WebServer/Logs
    Configuration files are renamed to make some sense:
        Access (access.conf)
        MIME (mime.types)
        Resources (srm.conf)
        Server (httpd.conf)
    conf.h has #defines to reflect these locations for -DRHAPSODY.

 2) I had trouble building outside of the source directory, so there are some VPATH
      additions (very minor) to makefiles and a SRCDIR addition to Configure.

 3) In order to build a fat binary (runs on Intel and PowerPC), I need to be able to
      specify CFLAGS='-arch ppc -arch i386' without nuking the CPP flags. So I
      separated out those flags to CPPFLAGS, as it should be anyway.
    Changed LFLAGS to LDFLAGS for similar reasons.

	-Fred
	 Rhapsody Core OS
	 wsanchez@apple.com


diff -r -U 5 apache_1.2.6/src/Configure apache.apple/apache/src/Configure
--- apache_1.2.6/src/Configure	Sat Feb 14 05:41:59 1998
+++ apache.apple/apache/src/Configure	Sat Apr 18 15:00:41 1998
@@ -8,17 +8,26 @@
 # At this point we change what Configuration contains. It maintain
 # contains comments, specific compiler flags, a list of included
 # modules and "rules". These rules are used to allow Configure to
 # be totally configured from Configuration
 #
-# Uses 3 supplemental scripts located in ./helpers: CutRule,
+# Uses 3 supplemental scripts located in ${SRCDIR}/helpers: CutRule,
 # GuessOS and PrintPath
 #

-file=Configuration
+#
+# Figure out srcdir for vpath
+# Use the path to this script
+#
+SRCDIR=`echo $0 | sed 's%/[^/][^/]*$%%'`
+if [ "x${SRCDIR}" = "x$0" ]; then SRCDIR=.; fi
+SRCDIR=`cd $SRCDIR ; pwd`
+echo "Sources are in: $SRCDIR"
+
+file=${SRCDIR}/Configuration
 tmpfile=htconf.$$
-makefile_tmpl=Makefile.tmpl
+makefile_tmpl=${SRCDIR}/Makefile.tmpl

 while [ "x$1" != "x" ]; do
   if [ "x$1" = "x-file" ] ; then
     shift 1; file=$1; shift 1
     if [ ! -r $file ]; then
@@ -132,14 +141,14 @@
     END { print "###############"; }'

 #
 # Extract the rules.
 #
-RULE_WANTHSREGEX=`./helpers/CutRule WANTHSREGEX $file`
-RULE_STATUS=`./helpers/CutRule STATUS $file`
-RULE_SOCKS4=`./helpers/CutRule SOCKS4 $file`
-RULE_IRIXNIS=`./helpers/CutRule IRIXNIS $file`
+RULE_WANTHSREGEX=`${SRCDIR}/helpers/CutRule WANTHSREGEX $file`
+RULE_STATUS=`${SRCDIR}/helpers/CutRule STATUS $file`
+RULE_SOCKS4=`${SRCDIR}/helpers/CutRule SOCKS4 $file`
+RULE_IRIXNIS=`${SRCDIR}/helpers/CutRule IRIXNIS $file`

 #
 # Now we determine the OS/Platform automagically, thanks to
 # GuessOS, a home-brewed OS-determiner ala config.guess
 #
@@ -152,20 +161,20 @@
 #
 # As more PLATFORMs are added to Configuration.tmpl, be sure to
 # add the required lines below.
 #

-PLAT=`./helpers/GuessOS`
+PLAT=`${SRCDIR}/helpers/GuessOS`

 # Preset DBM_LIB. Can be overridden on a per-platform basis.

 DBM_LIB="-ldbm"

 #
 # Look for ranlib. Do it early in case we want to override it below
 #
-if ./helpers/PrintPath -s ranlib; then
+if ${SRCDIR}/helpers/PrintPath -s ranlib; then
     RANLIB="ranlib"
 else
     RANLIB="true"
 fi

@@ -175,11 +184,11 @@
 # on which compiler we use/find
 #
 for compilers in "gcc" "cc" "acc" "c89"
 do
     lookedfor="$lookedfor $compilers"
-    if ./helpers/PrintPath -s $compilers; then
+    if ${SRCDIR}/helpers/PrintPath -s $compilers; then
 	COMPILER="$compilers"
     	break
     fi
 done

@@ -340,10 +349,15 @@
 	CFLAGS="$CFLAGS -DNEXT"
 	DEF_WANTHSREGEX=yes
 	RANLIB="sleep 5; /bin/ranlib"
 	# ranlib on most NeXTs sets the time wrong. 5 secs wait does much good
 	;;
+    *-apple-rhapsody*)
+	OS='Rhapsody'
+	CFLAGS="$CFLAGS -DRHAPSODY"
+	DEF_WANTHSREGEX=yes
+	;;
     *-dec-osf*)
 	OS='DEC OSF/1'
 	CFLAGS="$CFLAGS -DOSF1"
 	LIBS="$LIBS -lm"
 	;;
@@ -586,11 +600,11 @@
 #
 # Now HS's POSIX regex implementation if needed/wanted
 #
 if [ "$RULE_WANTHSREGEX" = "yes" ]; then
     REGLIB="regex/libregex.a"
-    INCLUDES="$INCLUDES -Iregex"
+    INCLUDES="$INCLUDES -I./regex -I\$(SRCDIR)/regex"
 fi

 #
 # Now SOCKS4.
 #  NOTE: We assume that if they are using SOCKS4, then they've
@@ -618,10 +632,11 @@
     echo "CC=$CC" >> Makefile.config
 fi
 if [ "x$OPTIM" != "x" ]; then
     echo "OPTIM=$OPTIM" >> Makefile.config
 fi
+echo "SRCDIR=$SRCDIR">> Makefile.config
 echo "CFLAGS1=$CFLAGS">> Makefile.config
 echo "INCLUDES1=$INCLUDES">> Makefile.config
 echo "LIBS1=$LIBS">> Makefile.config
 echo "LFLAGS1=$LFLAGS">> Makefile.config
 echo "BROKEN_BPRINTF_FLAGS=$OSBPRINTF">> Makefile.config
@@ -635,20 +650,24 @@
 # Now (finish) creating the makefiles
 cat Makefile.config >> Makefile
 sed -e "s#@@Configuration@@#$file#" "$makefile_tmpl" >>Makefile
 awk >>Makefile <$tmpfile \
    '($1 == "Module" && $3 ~ /modules\//) { printf "%s: modules/last-built ; @cat
/dev/null\n\n", $3, $3}'
-cat Makefile.config ../support/Makefile.tmpl > ../support/Makefile
+if [ ! -d ../support ]; then mkdir ../support; fi
+cat Makefile.config ${SRCDIR}/../support/Makefile.tmpl > ../support/Makefile

+if [ ! -d modules ]; then mkdir modules; fi
 cat << EOF > modules/Makefile
 #
 # Simple Makefile for modules in src/modules.
 # Generated by src/Configure according to rules in src/Configuration;
 # hand-edit at your own risk!
 #

 SHELL=$SHELL
+SRCDIR=.
+VPATH=\$(SRCDIR)
 EOF

 if [ "$RULE_WANTHSREGEX" = "yes" ]; then
     INCLUDES2="-I../../regex"
 fi
@@ -673,15 +692,17 @@

 clean: \$(CLEANERS)
 	@echo "Done cleaning module subdirectories"

 placeholder \$(MODULES): ForceMe
-	(cd \$@; \$(MAKE) CC='\$(CC)' AUX_CFLAGS='\$(MOD_CFLAGS)' RANLIB='\$(RANLIB)')
+	dir=\$(SRCDIR)/\`basename \$@\` ; \\
+	bdir=\`basename \$\$dir\` ; \\
+	if [ ! -d \$\$bdir  ]; then mkdir \$\$bdir; fi; \\
+	(cd \$\$bdir; \$(MAKE) CC='\$(CC)' AUX_CFLAGS='\$(MOD_CFLAGS)' RANLIB='\$(RANLIB)' SRCDIR="\$\$dir"
-f \$\${dir}/Makefile)

 ForceMe:

 EOF

 awk >>modules/Makefile <$tmpfile \
    '($1 == "Module" && $3 ~ /modules\//) { split ($3, pp, "/"); \
    printf "%s_clean:\n\t(cd %s; $(MAKE) clean)\n\n", pp[2], pp[2]}'
-
diff -r -U 5 apache_1.2.6/src/Makefile.tmpl apache.apple/apache/src/Makefile.tmpl
--- apache_1.2.6/src/Makefile.tmpl	Fri Jan 30 01:13:46 1998
+++ apache.apple/apache/src/Makefile.tmpl	Sat Apr 18 15:02:00 1998
@@ -1,22 +1,24 @@
 # Apache makefile template (well, suffix).

 # This is combined with the information in the "Configuration" file
 # by the configure script to make the actual Makefile.

-CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
+VPATH=$(SRCDIR)
+CFLAGS=$(OPTIM) $(EXTRA_CFLAGS)
+CPPFLAGS=$(CFLAGS1) $(INCLUDES)
 LIBS=$(EXTRA_LIBS) $(LIBS1)
-INCLUDES=$(INCLUDES1) $(EXTRA_INCLUDES)
-LFLAGS=$(LFLAGS1) $(EXTRA_LFLAGS)
+INCLUDES=-I$(SRCDIR) $(INCLUDES1) $(EXTRA_INCLUDES)
+LDFLAGS=$(LFLAGS1) $(EXTRA_LFLAGS)

 OBJS= alloc.o http_main.o http_core.o http_config.o http_request.o \
   http_log.o http_protocol.o rfc1413.o util.o util_script.o modules.o buff.o\
   md5c.o util_md5.o explain.o http_bprintf.o util_date.o util_snprintf.o\
   $(MODULES)

 .c.o:
-	$(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) $<
+	$(CC) -c $(CPPFLAGS) $(CFLAGS) $(SPACER) $<

 all: @@Configuration@@ httpd

 @@Configuration@@: Configuration.tmpl
 	@echo "@@Configuration@@ older than Configuration.tmpl, or doesn't exist."
@@ -24,18 +26,19 @@
 	@echo "Configure."
 	@echo "If not, you will at least have to touch @@Configuration@@."
 	@false

 httpd: $(REGLIB) $(OBJS)
-	$(CC) $(LFLAGS)  -o httpd $(OBJS) $(REGLIB) $(LIBS)
+	$(CC) $(LDFLAGS)  -o httpd $(OBJS) $(REGLIB) $(LIBS)

 regex/libregex.a:
-	(cd regex; $(MAKE) lib CC='$(CC)' AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)')
+	if [ ! -d regex ]; then mkdir regex; fi
+	(cd regex; $(MAKE) lib CC='$(CC)' AUX_CFLAGS='$(CPPFLAGS)' RANLIB='$(RANLIB)' SRCDIR='$(SRCDIR)/regex'
-f $(SRCDIR)/regex/Makefile)

 modules/last-built:
 	(cd modules; \
-	$(MAKE) CC='$(CC)' AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)')
+	$(MAKE) CC='$(CC)' AUX_CFLAGS='$(CPPFLAGS)' RANLIB='$(RANLIB)' SRCDIR='$(SRCDIR)/modules')

 clean:
 	rm -f httpd *.o core
 	cd regex; $(MAKE) clean
 	cd modules; $(MAKE) clean
@@ -47,18 +50,18 @@
 	tar cvf dist.tar README INSTALL CHANGES TODO API.html \
 		Configuration Configure Makefile.tmpl Makefile *.h *.c

 # Work around broken compilers
 http_bprintf.o: http_bprintf.c
-	$(CC) -c $(INCLUDES) $(CFLAGS) $(BROKEN_BPRINTF_FLAGS) http_bprintf.c
+	$(CC) -c $(CPPFLAGS) $(CFLAGS) $(BROKEN_BPRINTF_FLAGS) http_bprintf.c

 # We really don't expect end users to use this rule.  It works only with
 # gcc, and rebuilds Makefile.tmpl.  You have to re-run Configure after
 # using it.
 depend:
 	sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl > Makefile.new \
-	    && $(CC) -MM $(INCLUDES) $(CFLAGS) *.c >> Makefile.new \
+	    && $(CC) -MM $(CPPFLAGS) $(CFLAGS) *.c >> Makefile.new \
 	    && mv Makefile.tmpl Makefile.tmpl.bak \
 	    && mv Makefile.new Makefile.tmpl

 #Dependencies

Only in apache.apple/apache/src: PB.project
diff -r -U 5 apache_1.2.6/src/conf.h apache.apple/apache/src/conf.h
--- apache_1.2.6/src/conf.h	Sat Feb 14 05:37:22 1998
+++ apache.apple/apache/src/conf.h	Sat Apr 18 14:57:23 1998
@@ -254,10 +254,40 @@
 typedef int pid_t;
 #define JMP_BUF jmp_buf
 #define USE_LONGJMP
 #define NO_USE_SIGACTION

+#elif defined(RHAPSODY)
+#define HAVE_GMTOFF
+/* mmap() is not implemented in DR1
+ * #define HAVE_MMAP
+ * #undef  MAP_ANON // Not implemented by mmap() (as of kernel-82)
+ */
+#define HAVE_RESOURCE
+#define HAVE_SYS_RESOURCE_H
+#define HAVE_SYS_SELECT_H
+#define HAVE_SNPRINTF
+#define JMP_BUF jmp_buf
+#define USE_LONGJMP
+#define NO_USE_SIGACTION
+#define HTTPD_ROOT           "/Local/Library/WebServer"
+#define DOCUMENT_LOCATION    "/Local/Library/WebServer/Documents"
+#define DEFAULT_USER         "nobody"
+#define DEFAULT_GROUP        "nogroup"
+#define DEFAULT_XFERLOG      "Logs/Access"
+#define DEFAULT_ERRORLOG     "Logs/Errors"
+#define DEFAULT_PIDLOG       "Logs/Process"
+#define DEFAULT_SCOREBOARD   "Logs/Status"
+#define DEFAULT_LOCKFILE     "Logs/Lock"
+#define SERVER_CONFIG_FILE   "Configuration/Server"
+#define RESOURCE_CONFIG_FILE "Configuration/Resources"
+#define TYPES_CONFIG_FILE    "Configuration/MIME"
+#define ACCESS_CONFIG_FILE   "Configuration/Access"
+#define DEFAULT_USER_DIR     "Library/Web Documents"
+#define DEFAULT_PATH         "/bin:/usr/bin:/usr/local/bin"
+#define SUEXEC_BIN           "/usr/libexec/suexec"
+
 #elif defined(LINUX)
 #if LINUX > 1
 #define HAVE_SHMGET
 #define HAVE_SYS_RESOURCE_H
 typedef int rlim_t;
@@ -698,10 +728,18 @@

 #ifdef offsetof
 #define XtOffsetOf(s_type,field) offsetof(s_type,field)
 #else
 #define XtOffsetOf(s_type,field) XtOffset(s_type*,field)
+#endif
+
+/* On OpenStep and Rhapsody, symbols that conflict with loaded dylibs
+ * (eg. System framework) need to be declared __private_extern__.
+ * For other systems, make that a no-op.
+ */
+#if !defined(__APPLE__) && !defined(NeXT)
+#define __private_extern__
 #endif

 #ifdef SUNOS_LIB_PROTOTYPES
 /* Prototypes needed to get a clean compile with gcc -Wall.
  * Believe it or not, these do have to be declared, at least on SunOS,
diff -r -U 5 apache_1.2.6/src/helpers/GuessOS apache.apple/apache/src/helpers/GuessOS
--- apache_1.2.6/src/helpers/GuessOS	Fri Feb 13 08:05:24 1998
+++ apache.apple/apache/src/helpers/GuessOS	Sat Apr 18 14:57:28 1998
@@ -202,10 +202,18 @@

     NonStop-UX:4.[02]*:[BC]*:*)
 	echo "${MACHINE}-tandem-sysv4"; exit 0;
 	;;

+    Rhapsody:*:*:*)
+	case "${MACHINE}" in
+	    "Power Macintosh")
+		MACHINE=powerpc ;;
+	esac
+	echo "${MACHINE}-apple-rhapsody${RELEASE}"; exit 0
+	;;
+
 esac

 #
 # Ugg. These are all we can determine by what we know about
 # the output of uname. Be more creative:
diff -r -U 5 apache_1.2.6/src/httpd.h apache.apple/apache/src/httpd.h
--- apache_1.2.6/src/httpd.h	Wed Feb 18 23:42:59 1998
+++ apache.apple/apache/src/httpd.h	Sat Apr 18 15:07:55 1998
@@ -179,11 +179,13 @@
 #endif

 /* Whether we should enable rfc1413 identity checking */
 #define DEFAULT_RFC1413 0
 /* The default directory in user's home dir */
+#ifndef DEFAULT_USER_DIR
 #define DEFAULT_USER_DIR "public_html"
+#endif

 /* The default path for CGI scripts if none is currently set */
 #ifndef DEFAULT_PATH
 #define DEFAULT_PATH "/bin:/usr/bin:/usr/ucb:/usr/bsd:/usr/local/bin"
 #endif
diff -r -U 5 apache_1.2.6/src/modules/example/Makefile apache.apple/apache/src/modules/example/Makefile
--- apache_1.2.6/src/modules/example/Makefile	Fri Apr 11 15:12:33 1997
+++ apache.apple/apache/src/modules/example/Makefile	Wed Oct 15 08:36:20 1997
@@ -49,10 +49,13 @@
 # project, please see <http://www.apache.org/>.
 #
 # Makefile for the Apache example module
 #

+SRCDIR=.
+VPATH=$(SRCDIR)
+
 #
 # This normally lives in modules/example under the Apache source
 # directory.  If the depth or relationship changes, the following line
 # may need to be changed.
 #
Only in apache.apple/apache/src/modules/proxy: CVS
diff -r -U 5 apache_1.2.6/src/modules/proxy/Makefile apache.apple/apache/src/modules/proxy/Makefile
--- apache_1.2.6/src/modules/proxy/Makefile	Tue Mar 18 02:23:56 1997
+++ apache.apple/apache/src/modules/proxy/Makefile	Wed Oct 15 10:31:23 1997
@@ -51,27 +51,31 @@
 # Makefile for the Apache proxy library
 #

 SHELL = /bin/sh

-INCDIR = ../..
+SRCDIR=.
+VPATH=$(SRCDIR)
+
+INCDIR = $(SRCDIR)/../..

 LIB=libproxy.a

 # AUX_CFLAGS comes from higher level Makefile
-CFLAGS=-I$(INCDIR) $(AUX_CFLAGS)
+CFLAGS=
+CPPFLAGS=-I$(INCDIR) $(AUX_CFLAGS)

 # Internal stuff, should not need changing.
 PROXYSRC=mod_proxy.c proxy_cache.c proxy_connect.c proxy_ftp.c proxy_http.c \
 proxy_util.c

 OBJS=$(PROXYSRC:.c=.o)

 default:	force $(LIB)

 .c.a:
-	$(MAKE) $(CFLAGS) $<
+	$(MAKE) $(CPPFLAGS) $(CFLAGS) $<

 force:
 	rm -f $(LIB)

 $(LIB):	$(OBJS)
Only in apache.apple/apache/src/regex: CVS
diff -r -U 5 apache_1.2.6/src/regex/Makefile apache.apple/apache/src/regex/Makefile
--- apache_1.2.6/src/regex/Makefile	Sun Jul 28 03:32:19 1996
+++ apache.apple/apache/src/regex/Makefile	Wed Oct 15 08:36:29 1997
@@ -1,14 +1,18 @@
 SHELL = /bin/sh

+SRCDIR=.
+VPATH=$(SRCDIR)
+
 # You probably want to take -DREDEBUG out of CFLAGS, and put something like
 # -O in, *after* testing (-DREDEBUG strengthens testing by enabling a lot of
 # internal assertion checking and some debugging facilities).
 # Put -Dconst= in for a pre-ANSI compiler.
 # Do not take -DPOSIX_MISTAKE out.
 # REGCFLAGS isn't important to you (it's for my use in some special contexts).
-CFLAGS=-I. -DPOSIX_MISTAKE $(AUX_CFLAGS)
+CFLAGS=$(AUX_CFLAGS)
+CPPFLAGS=-I. -DPOSIX_MISTAKE

 # If you have a pre-ANSI compiler, put -o into MKHFLAGS.  If you want
 # the Berkeley __P macro, put -b in.
 MKHFLAGS=

@@ -31,11 +35,11 @@
 JUNKLINT=possible pointer alignment|null effect

 # arrangements to build forward-reference header files
 .SUFFIXES:	.ih .h
 .c.ih:
-	sh ./mkh $(MKHFLAGS) -p $< >$@
+	sh $(SRCDIR)/mkh $(MKHFLAGS) -p $< >$@

 default:	r

 lib:	purge $(OBJPRODN)
 	rm -f libregex.a
@@ -47,11 +51,11 @@

 # stuff to build regex.h
 REGEXH=regex.h
 REGEXHSRC=regex2.h $(REGSRC)
 $(REGEXH):	$(REGEXHSRC) mkh
-	sh ./mkh $(MKHFLAGS) -i _REGEX_H_ $(REGEXHSRC) >regex.tmp
+	sh $(SRCDIR)/mkh $(MKHFLAGS) -i _REGEX_H_ $(REGEXHSRC) >regex.tmp
 	cmp -s regex.tmp regex.h 2>/dev/null || cp regex.tmp regex.h
 	rm -f regex.tmp

 # dependencies
 $(OBJPRODN) debug.o:	utils.h regex.h regex2.h
diff -r -U 5 apache_1.2.6/src/regex/regcomp.c apache.apple/apache/src/regex/regcomp.c
--- apache_1.2.6/src/regex/regcomp.c	Sun Feb 16 20:52:41 1997
+++ apache.apple/apache/src/regex/regcomp.c	Thu Apr 16 11:00:09 1998
@@ -80,10 +80,11 @@
  = #define	REG_NEWLINE	0010
  = #define	REG_NOSPEC	0020
  = #define	REG_PEND	0040
  = #define	REG_DUMP	0200
  */
+__private_extern__
 int				/* 0 success, otherwise REG_something */
 regcomp(preg, pattern, cflags)
 regex_t *preg;
 const char *pattern;
 int cflags;
diff -r -U 5 apache_1.2.6/src/regex/regexec.c apache.apple/apache/src/regex/regexec.c
--- apache_1.2.6/src/regex/regexec.c	Sun Feb 16 20:52:41 1997
+++ apache.apple/apache/src/regex/regexec.c	Thu Apr 16 11:00:10 1998
@@ -109,10 +109,11 @@
  *
  * We put this here so we can exploit knowledge of the state representation
  * when choosing which matcher to call.  Also, by this point the matchers
  * have been prototyped.
  */
+__private_extern__
 int				/* 0 success, REG_NOMATCH failure */
 regexec(preg, string, nmatch, pmatch, eflags)
 const regex_t *preg;
 const char *string;
 size_t nmatch;
diff -r -U 5 apache_1.2.6/src/regex/regfree.c apache.apple/apache/src/regex/regfree.c
--- apache_1.2.6/src/regex/regfree.c	Tue Jul 23 15:06:47 1996
+++ apache.apple/apache/src/regex/regfree.c	Thu Apr 16 11:00:11 1998
@@ -8,10 +8,11 @@

 /*
  - regfree - free everything
  = extern void regfree(regex_t *);
  */
+__private_extern__
 void
 regfree(preg)
 regex_t *preg;
 {
 	register struct re_guts *g;
Only in apache.apple/apache/support: CVS
diff -r -U 5 apache_1.2.6/support/Makefile.tmpl apache.apple/apache/support/Makefile.tmpl
--- apache_1.2.6/support/Makefile.tmpl	Mon Mar 10 01:31:34 1997
+++ apache.apple/apache/support/Makefile.tmpl	Wed Oct 15 08:36:31 1997
@@ -1,10 +1,11 @@
 # Apache makefile template (well, suffix).

 # This is combined with the information in the "Configuration" file
 # by the configure script to make the actual Makefile.

+VPATH=$(SRCDIR)
 CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
 LIBS=$(EXTRA_LIBS) $(LIBS1)
 INCLUDES=-I../src -I../src/regex $(INCLUDES1) $(EXTRA_INCLUDES)
 LFLAGS=$(LFLAGS1) $(EXTRA_LFLAGS)


Mime
View raw message