diff options
| -rw-r--r-- | Makefile.in | 12 | ||||
| -rw-r--r-- | configure.in | 15 | ||||
| -rw-r--r-- | helpers/rules.mk.in | 6 |
3 files changed, 15 insertions, 18 deletions
diff --git a/Makefile.in b/Makefile.in index 906367518..af860b2f8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -62,18 +62,10 @@ delete-exports: fi $(TARGET_EXPORTS): - if test -z "$(srcdir)"; then \ - $(AWK) -f helpers/make_export.awk include/*.h > $@ ; \ - else \ - $(AWK) -f $(srcdir)helpers/make_export.awk $(srcdir)include/*.h > $@ ; \ - fi + $(MKEXPORT) include/*.h > $@ docs: - if test -z "$(srcdir)"; then \ - helpers/scandoc -ihelpers/default.pl -p./docs/ ./include/*.h; \ - else \ - $(srcdir)helpers/scandoc -i$(srcdir)helpers/default.pl -p./docs/ $(srcdir)include/*.h; \ - fi + $(SCANDOC) -ihelpers/default.pl -p./docs/ ./include/*.h test: $(TARGET_LIB) (cd test; make clean; make; \ diff --git a/configure.in b/configure.in index 72a3c9d67..a66240a1f 100644 --- a/configure.in +++ b/configure.in @@ -26,12 +26,6 @@ dnl Libtool needs this symbol top_builddir="$abs_builddir" AC_SUBST(top_builddir) -dnl Get location of helpers directory -dnl XXX This assumes that APR "lives" under Apache. -dnl XXX We'll need to fix this when we pull it out. -abs_helpersdir=$abs_srcdir/helpers -MKDIR=$abs_helpersdir/mkdir.sh - if test "$abs_builddir" != "$abs_srcdir"; then USE_VPATH=1 fi @@ -48,6 +42,15 @@ AC_PROG_AWK AC_CHECK_PROG(RM, rm, rm) AC_CHECK_TOOL(AR, ar, ar) +dnl Get locations of the build helper scripts +MKDIR=$abs_srcdir/helpers/mkdir.sh +APR_MKEXPORT="$AWK -f $abs_srcdir/helpers/make_export.awk" +AC_SUBST(APR_MKEXPORT) +APR_MKDEP=$abs_srcdir/helpers/mkdep.sh +AC_SUBST(APR_MKDEP) +APR_SCANDOC=$abs_srcdir/helpers/scandoc +AC_SUBST(APR_SCANDOC) + # This macro needs to be here in case we are on an AIX box. AC_AIX diff --git a/helpers/rules.mk.in b/helpers/rules.mk.in index c56e4a846..7bc932ffc 100644 --- a/helpers/rules.mk.in +++ b/helpers/rules.mk.in @@ -75,11 +75,13 @@ LDFLAGS=@LDFLAGS@ RM=@RM@ SHELL=@SHELL@ +MKEXPORT=@APR_MKEXPORT@ +MKDEP=@APR_MKDEP@ +SCANDOC=@APR_SCANDOC@ + ### make LTFLAGS somewhat variable? LTFLAGS = --silent -MKDEP=$(top_builddir)/helpers/mkdep.sh - # # Basic macro setup # |