summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy T. Fielding <fielding@apache.org>2001-02-18 16:07:31 +0000
committerRoy T. Fielding <fielding@apache.org>2001-02-18 16:07:31 +0000
commit7b1b30525b085dc9fea5ab94dc946e5bd8a7e566 (patch)
treead7e02568783325d71af7c282aee6f8565779736
parent8f1ccc9900ab83d4f8573757c52bbe2bb5053831 (diff)
downloadhttpd-7b1b30525b085dc9fea5ab94dc946e5bd8a7e566.tar.gz
Intermediate change of hardcoded "helpers" reference to "build"
until I get a chance to revamp this to use APR's variables directly. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88230 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--Makefile.in2
-rw-r--r--configure.in2
-rw-r--r--modules/aaa/mod_auth_db.module8
-rw-r--r--modules/aaa/mod_auth_dbm.c2
-rw-r--r--modules/mappers/mod_rewrite.c2
-rw-r--r--server/Makefile.in2
6 files changed, 9 insertions, 9 deletions
diff --git a/Makefile.in b/Makefile.in
index a939f2450f..313dc2be34 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -49,7 +49,7 @@ htdocs-srcdir = docs/docroot
docs::
mkdir -p ./docs/api
- srclib/apr/helpers/scandoc -isrclib/apr/helpers/default.pl -p./docs/api/ ./include/*.h
+ srclib/apr/build/scandoc -isrclib/apr/build/default.pl -p./docs/api/ ./include/*.h
install-htdocs:
@echo Installing HTML documents
diff --git a/configure.in b/configure.in
index c7488fc603..00403cae93 100644
--- a/configure.in
+++ b/configure.in
@@ -21,7 +21,7 @@ dnl Absolute source/build directory
abs_srcdir=`(cd $srcdir && pwd)`
abs_builddir=`pwd`
-MKDIR=$abs_srcdir/srclib/apr/helpers/mkdir.sh
+MKDIR=$abs_srcdir/srclib/apr/build/mkdir.sh
APACHE_CONFIG_NICE(config.nice)
diff --git a/modules/aaa/mod_auth_db.module b/modules/aaa/mod_auth_db.module
index 618ee6a3d5..525075c3f1 100644
--- a/modules/aaa/mod_auth_db.module
+++ b/modules/aaa/mod_auth_db.module
@@ -3,17 +3,17 @@ ConfigStart
# XXX: this needs updating for apache-2.0 configuration method
DB_VERSION=''
DB_LIB=''
- if ./helpers/TestCompile func db_open; then
+ if ./build/TestCompile func db_open; then
DB_VERSION='Berkeley-DB/2.x'
else
- if ./helpers/TestCompile lib db db_open; then
+ if ./build/TestCompile lib db db_open; then
DB_VERSION='Berkeley-DB/2.x'
DB_LIB='-ldb'
else
- if ./helpers/TestCompile func dbopen; then
+ if ./build/TestCompile func dbopen; then
DB_VERSION='Berkeley-DB/1.x'
else
- if ./helpers/TestCompile lib db dbopen; then
+ if ./build/TestCompile lib db dbopen; then
DB_VERSION='Berkeley-DB/1.x'
DB_LIB='-ldb'
fi
diff --git a/modules/aaa/mod_auth_dbm.c b/modules/aaa/mod_auth_dbm.c
index f8fd400f67..9ac71a741d 100644
--- a/modules/aaa/mod_auth_dbm.c
+++ b/modules/aaa/mod_auth_dbm.c
@@ -106,7 +106,7 @@
* MODULE-DEFINITION-START
* Name: auth_dbm_module
* ConfigStart
- . ./helpers/find-dbm-lib
+ . ./build/find-dbm-lib
* ConfigEnd
* MODULE-DEFINITION-END
*/
diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c
index c0ab7cc4c3..8e1e77656c 100644
--- a/modules/mappers/mod_rewrite.c
+++ b/modules/mappers/mod_rewrite.c
@@ -164,7 +164,7 @@
* MODULE-DEFINITION-START
* Name: rewrite_module
* ConfigStart
- . ./helpers/find-dbm-lib
+ . ./build/find-dbm-lib
if [ "x$found_dbm" = "x1" ]; then
echo " enabling DBM support for mod_rewrite"
else
diff --git a/server/Makefile.in b/server/Makefile.in
index b3e89717dd..bcbee0e851 100644
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -51,7 +51,7 @@ delete-exports:
$(TARGET_EXPORTS):
- $(AWK) -f $(top_srcdir)/srclib/apr/helpers/make_export.awk $(top_srcdir)/include/*.h > $@
+ $(AWK) -f $(top_srcdir)/srclib/apr/build/make_export.awk $(top_srcdir)/include/*.h > $@
exports.c: $(EXPORT_FILES)
(cat $(EXPORT_FILES) | ../build/buildexports.sh ..) > $@