rbb 99/05/14 05:51:38
Modified: apr Makefile.in configure.in
Log:
Changes to remove hard-coded paths from autoconf stuff.
Revision Changes Path
1.5 +1 -1 apache-apr/apr/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-apr/apr/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.in 1999/05/12 20:32:00 1.4
+++ Makefile.in 1999/05/14 12:51:37 1.5
@@ -22,7 +22,7 @@
# Macros for target determination
#
MODULES=lib file_io network_io threadproc locks misc
-SUBDIRS=lib file_io/unix network_io/unix threadproc/unix locks/unix misc/unix
+SUBDIRS=lib file_io/@OSDIR@ network_io/@OSDIR@ threadproc/@OSDIR@
locks/@OSDIR@ misc/@OSDIR@
#
# Rules for turning inputs into outputs
1.9 +6 -2 apache-apr/apr/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apache-apr/apr/configure.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- configure.in 1999/05/13 13:06:51 1.8
+++ configure.in 1999/05/14 12:51:37 1.9
@@ -23,6 +23,7 @@
SYS_KV=`echo $SYS_REL | awk -F. '{printf "%s%s", $1, $2}'`
LDLIBS="$LDLIBS -ldl"
PLATFORM="-DLINUX=$SYS_KV"
+ OSDIR="unix"
case "$SYS_KV" in
2*)
LDLIBS="$LDLIBS -lm"
@@ -35,6 +36,7 @@
SYS_KV=`echo $SYS_KV | awk -F. '{printf "%s%s%s", $1, $2, $3}'`
CFLAGS="$CFLAGS -U__STR__"
PLATFORM="-DAIX=$SYS_KV"
+ OSDIR="unix"
case "$SYS_KV" in
[12]*)
AC_DEFINE(USEBCOPY)
@@ -62,6 +64,7 @@
if (test "$SYS_SW" = "OS/2"); then
PLATFORM="-DOS2"
+ OSDIR="os2"
fi
dnl Checks for header files.
@@ -130,5 +133,6 @@
AC_SUBST(OPTIM)
AC_SUBST(RANLIB)
AC_SUBST(PLATFORM)
-AC_OUTPUT(Makefile lib/Makefile file_io/unix/Makefile
network_io/unix/Makefile
-threadproc/unix/Makefile locks/unix/Makefile misc/unix/Makefile
test/Makefile)
+AC_SUBST(OSDIR)
+AC_OUTPUT(Makefile lib/Makefile file_io/$OSDIR/Makefile
network_io/$OSDIR/Makefile
+threadproc/$OSDIR/Makefile locks/$OSDIR/Makefile misc/$OSDIR/Makefile
test/Makefile)
