diff options
| -rw-r--r-- | Makefile.in | 12 | ||||
| -rw-r--r-- | aclocal.m4 | 2 | ||||
| -rw-r--r-- | configure.in | 11 | ||||
| -rw-r--r-- | dso/unix/Makefile.in | 4 | ||||
| -rw-r--r-- | dso/unix/dso.c | 2 | ||||
| -rw-r--r-- | locks/unix/Makefile.in | 4 | ||||
| -rw-r--r-- | locks/unix/locks.c | 2 |
7 files changed, 28 insertions, 9 deletions
diff --git a/Makefile.in b/Makefile.in index c9b83118e..85a0ddd4d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -116,10 +116,18 @@ delete-exports: fi $(TARGET_EXPORTS): - perl ./helpers/make_export.pl -o $@ include/*.h + if test -z "$(srcdir)"; then \ + perl $(srcdir)helpers/make_export.pl -o $@ include/*.h; \ + else \ + perl $(srcdir)helpers/make_export.pl -o $@ include/*.h $(srcdir)include/*.h; \ + fi docs: - ./helpers/scandoc -i./helpers/default.pl -p./docs/ ./include/*.h + if test -z "$(srcdir)"; then \ + $(srcdir)helpers/scandoc -i$(srcdir)helpers/default.pl -p./docs/ ./include/*.h; \ + else \ + $(srcdir)helpers/scandoc -i$(srcdir)helpers/default.pl -p./docs/ ./include/*.h $(srcdir)include/*.h; \ + fi test: $(LIBAPR) (cd test; make clean; make; \ diff --git a/aclocal.m4 b/aclocal.m4 index a868e242c..ee8a7e7b9 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -328,7 +328,7 @@ int main(void) { AC_DEFUN(APR_PREPARE_MM_DIR,[ dnl #----------------------------- Prepare mm directory for VPATH support if test -n "$USE_MM" && test -n "$USE_VPATH"; then - test -d $mm_dir || $MKDIR -p $mm_dir + test -d $mm_dir || $MKDIR $mm_dir for i in shtool config.guess config.sub fbtool ltconfig \ ltmain.sh mm_vers.c; do diff --git a/configure.in b/configure.in index a60bd8b43..eac9b4748 100644 --- a/configure.in +++ b/configure.in @@ -801,7 +801,7 @@ MAKEFILE1="Makefile lib/Makefile strings/Makefile passwd/Makefile tables/Makefil SUBDIRS="lib strings passwd tables " for dir in $MODULES do - test -d $dir || $MKDIR -p $dir + test -d $dir || $MKDIR $dir if test -f $srcdir/$dir/$OSDIR/Makefile.in; then MAKEFILE2="$MAKEFILE2 $dir/$OSDIR/Makefile " SUBDIRS="$SUBDIRS $dir/$OSDIR " @@ -825,6 +825,9 @@ for i in $SAVE_FILES; do test -r $i && mv $i $i.save done +dir=include/arch/unix +test -d $dir || $MKDIR $dir + AC_OUTPUT($MAKEFILE1 $MAKEFILE2 $MAKEFILE3 include/apr.h APRVARS,[ SAVE_FILES="include/apr.h include/apr_private.h" @@ -855,7 +858,11 @@ VPATH = $abs_srcdir/$dir EOF ) | cat - $makefile | \ - sed -e 's#-I\($(INCDIR[0-9]*)\)#-I\1 -I$(srcdir)/\1#g' > tmp + sed \ + -e 's#-I\($(INCDIR[0-9]*)\)#-I\1 -I$(srcdir)\1#g' \ + -e 's#-I\($(OSDIR[0-9]*)\)#-I\1 -I$(srcdir)\1#g' \ + -e 's#-I\($(DEFOSDIR[0-9]*)\)#-I\1 -I$(srcdir)\1#g' \ + > tmp cp tmp $makefile done if test -n "$USE_MM"; then diff --git a/dso/unix/Makefile.in b/dso/unix/Makefile.in index e4f0e1a90..c3d9c2b42 100644 --- a/dso/unix/Makefile.in +++ b/dso/unix/Makefile.in @@ -6,7 +6,9 @@ CFLAGS=@CFLAGS@ @OPTIM@ LIBS=@LIBS@ LDFLAGS=@LDFLAGS@ $(LIBS) INCDIR=../../include -INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch +INCDIR2=$(INCDIR)/arch +INCDIR3=$(INCDIR)/arch/unix +INCLUDES=-I$(INCDIR) -I$(INCDIR2) -I$(INCDIR3) MKDEP=../../helpers/mkdep.sh LIB=libdso.a diff --git a/dso/unix/dso.c b/dso/unix/dso.c index 14572dbfd..6741449ab 100644 --- a/dso/unix/dso.c +++ b/dso/unix/dso.c @@ -52,7 +52,7 @@ * <http://www.apache.org/>. */ -#include "unix/dso.h" +#include "dso.h" #include "apr_strings.h" #if APR_HAS_DSO diff --git a/locks/unix/Makefile.in b/locks/unix/Makefile.in index fb0c6d9c7..30530fedb 100644 --- a/locks/unix/Makefile.in +++ b/locks/unix/Makefile.in @@ -5,7 +5,9 @@ CFLAGS=@CFLAGS@ @OPTIM@ LIBS=@LIBS@ LDFLAGS=@LDFLAGS@ $(LIBS) INCDIR=../../include -INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch +INCDIR2=$(INCDIR)/arch +INCDIR3=$(INCDIR)/arch/unix +INCLUDES=-I$(INCDIR) -I$(INCDIR2) -I$(INCDIR3) MKDEP=../../helpers/mkdep.sh OBJS=locks.o \ diff --git a/locks/unix/locks.c b/locks/unix/locks.c index 518af1a31..8104e22fe 100644 --- a/locks/unix/locks.c +++ b/locks/unix/locks.c @@ -52,7 +52,7 @@ * <http://www.apache.org/>. */ -#include "unix/locks.h" +#include "locks.h" #include "apr_strings.h" #include "apr_portable.h" |