Minor nit: use top_srcdir instead of topsrcdir, to be more consistent

with autoconf.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84770 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/Makefile.in b/Makefile.in
index 6f161507b3f49ec6832a548bed2c8d0dc4c1765e..1d3e0890a5ebce37add98e790c627dfa85797935 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,6 +1,6 @@
 
 DEPTH     = .
-topsrcdir = @topsrcdir@
+top_srcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
@@ -25,8 +25,8 @@ install_targets = install-conf install-htdocs install-icons install-other \
        install-cgi install-include
 DISTCLEANFILES  = apaci include/config_auto.h modules.c
 
-include $(topsrcdir)/build/rules.mk
-include $(topsrcdir)/build/program.mk
+include $(top_srcdir)/build/rules.mk
+include $(top_srcdir)/build/program.mk
 
 install-conf:
        @echo Installing configuration files

diff --git a/build/fastgen.sh b/build/fastgen.sh
index bdf5b7d7b001ce663e60d3da704f9b5ccd7db9e6..7f58e42455cad9fb54f88240c37d3034fb29caa9 100755 (executable)
--- a/build/fastgen.sh
+++ b/build/fastgen.sh
@@ -64,7 +64,7 @@
 srcdir=$1
 shift
 
-topsrcdir=`(cd $srcdir; pwd)`
+top_srcdir=`(cd $srcdir; pwd)`
 
 mkdir_p=$1
 shift
@@ -72,7 +72,7 @@ shift
 if test "$mkdir_p" = "yes"; then
   mkdir_p="mkdir -p"
 else
-  mkdir_p="$topsrcdir/helpers/mkdir.sh"
+  mkdir_p="$top_srcdir/helpers/mkdir.sh"
 fi
 
 base="\$(DEPTH)/$srcdir"
@@ -82,7 +82,7 @@ for i in $@ ; do
        dir=`dirname $i`
        $mkdir_p $dir
        sed \
-               -e s#@topsrcdir@#$base# \
+               -e s#@top_srcdir@#$base# \
                -e s#@srcdir@#$base/$dir# \
-       < $topsrcdir/$i.in > $i
+       < $top_srcdir/$i.in > $i
 done

diff --git a/build/ltlib.mk b/build/ltlib.mk
index f65c5bec2547d3d2624e91927bf81bca2910ea1f..7ebd54817a07a402d9fe9aa635e64014aa507ef8 100644 (file)
--- a/build/ltlib.mk
+++ b/build/ltlib.mk
@@ -62,6 +62,6 @@
 
 targets = $(LTLIBRARY_NAME)
 
-include $(topsrcdir)/build/rules.mk
-include $(topsrcdir)/build/library.mk
+include $(top_srcdir)/build/rules.mk
+include $(top_srcdir)/build/library.mk
 

diff --git a/build/rules.mk b/build/rules.mk
index a50a7a64dcf17303bbf3432d71fce88d01f5243d..fdaa69c0aaf6ec3169745dea26c7916255477493 100644 (file)
--- a/build/rules.mk
+++ b/build/rules.mk
@@ -79,7 +79,6 @@ SHLINK = $(SHLIBTOOL) --mode=link $(CCLD) $(CFLAGS) $(EXTRA_CFLAGS) $(LDFLAGS) -
 
 DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I$(DEPTH)
 
-top_srcdir   = $(topsrcdir)
 top_builddir = $(DEPTH)
 
 .SUFFIXES:

diff --git a/build/special.mk b/build/special.mk
index 11abead2caf528d5fd67ddc0c3ef38987de2c4a4..ff610f3a1a09e6f718a06fae44689b06d96fc177 100644 (file)
--- a/build/special.mk
+++ b/build/special.mk
@@ -77,5 +77,5 @@ install-modules:
                done; \
        fi      
 
-include $(topsrcdir)/build/rules.mk
+include $(top_srcdir)/build/rules.mk
 

diff --git a/modules/Makefile.in b/modules/Makefile.in
index da8a82274b520da3732c026b786d97d192c7c624..11239ae8fb1c1c67681d1a8027c7106068fb14c9 100644 (file)
--- a/modules/Makefile.in
+++ b/modules/Makefile.in
@@ -1,10 +1,10 @@
 
 DEPTH     = ..
-topsrcdir = @topsrcdir@
+top_srcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 SUBDIRS = mpm $(MODULE_DIRS)
 
-include $(topsrcdir)/build/rules.mk
+include $(top_srcdir)/build/rules.mk
 

diff --git a/modules/aaa/Makefile.in b/modules/aaa/Makefile.in
index ccd3c1975523f3db93363a4874d7c44967d37bbd..3eeb709e0af4b874572dbe6409d225c257277b0d 100644 (file)
--- a/modules/aaa/Makefile.in
+++ b/modules/aaa/Makefile.in
@@ -1,8 +1,8 @@
 
 DEPTH     = ../..
-topsrcdir = @topsrcdir@
+top_srcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
-include $(topsrcdir)/build/special.mk
+include $(top_srcdir)/build/special.mk
 

diff --git a/os/Makefile.in b/os/Makefile.in
index 0e62c951ce8d180060211f912d21e7bb97d2d66b..96234c1488a1ed18775c30cf23a23fb0f5ba4d33 100644 (file)
--- a/os/Makefile.in
+++ b/os/Makefile.in
@@ -1,9 +1,9 @@
 
 DEPTH     = ..
-topsrcdir = @topsrcdir@
+top_srcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 SUBDIRS = $(OS)
 
-include $(topsrcdir)/build/rules.mk
+include $(top_srcdir)/build/rules.mk

diff --git a/os/beos/Makefile.in b/os/beos/Makefile.in
index ea86214b21a631770bee75fb48c940ea6567aefd..d9b0c410688b237b8908b982925e53459a43dc27 100644 (file)
--- a/os/beos/Makefile.in
+++ b/os/beos/Makefile.in
@@ -1,10 +1,10 @@
 
 DEPTH     = ../..
-topsrcdir = @topsrcdir@
+top_srcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 LTLIBRARY_NAME    = libos.la
 LTLIBRARY_SOURCES = os.c os-inline.c beosd.c iol_socket.c
 
-include $(topsrcdir)/build/ltlib.mk
+include $(top_srcdir)/build/ltlib.mk

diff --git a/os/os2/Makefile.in b/os/os2/Makefile.in
index c03ac3fca1584c1576030de5667fac1df17b433e..63e0fbb44d0bdbdf15dda163333642dddde933a4 100644 (file)
--- a/os/os2/Makefile.in
+++ b/os/os2/Makefile.in
@@ -1,10 +1,10 @@
 
 DEPTH     = ../..
-topsrcdir = @topsrcdir@
+top_srcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 LTLIBRARY_NAME    = libos.la
 LTLIBRARY_SOURCES = os.c os-inline.c util_os2.c iol_socket.c
 
-include $(topsrcdir)/build/ltlib.mk
+include $(top_srcdir)/build/ltlib.mk

diff --git a/os/unix/Makefile.in b/os/unix/Makefile.in
index 82b2dfc8cade311101e084944f1493bd7cedd71f..66d164412c6fd06cb99b0fec4fd6d72ebf117d77 100644 (file)
--- a/os/unix/Makefile.in
+++ b/os/unix/Makefile.in
@@ -1,10 +1,10 @@
 
 DEPTH     = ../..
-topsrcdir = @topsrcdir@
+top_srcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 LTLIBRARY_NAME    = libos.la
 LTLIBRARY_SOURCES = os.c os-inline.c unixd.c iol_socket.c
 
-include $(topsrcdir)/build/ltlib.mk
+include $(top_srcdir)/build/ltlib.mk

diff --git a/server/Makefile.in b/server/Makefile.in
index dd10393ce6b5063397a7aaee3d342fb79382e9fc..114cd4abee79dc88fa7b595ff2e5f64ae1a029cb 100644 (file)
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -1,6 +1,6 @@
 
 DEPTH     = ..
-topsrcdir = @topsrcdir@
+top_srcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
@@ -14,7 +14,7 @@ LTLIBRARY_SOURCES = \
        util_script.c util_uri.c util_md5.c \
        rfc1413.c http_connection.c iol_file.c listen.c
 
-include $(topsrcdir)/build/ltlib.mk
+include $(top_srcdir)/build/ltlib.mk
 
 gen_uri_delims_OBJECTS = gen_uri_delims.lo
 gen_uri_delims: $(gen_uri_delims_OBJECTS)

diff --git a/server/mpm/Makefile.in b/server/mpm/Makefile.in
index 7f678e86bfd25f75e54c2e676b9d8ad5d6932195..87897bb29f42e346a91f5c9de97362f8a9bd71e2 100644 (file)
--- a/server/mpm/Makefile.in
+++ b/server/mpm/Makefile.in
@@ -1,9 +1,9 @@
 
 DEPTH     = ../..
-topsrcdir = @topsrcdir@
+top_srcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 SUBDIRS = $(MPM_NAME)
 
-include $(topsrcdir)/build/rules.mk
+include $(top_srcdir)/build/rules.mk

diff --git a/server/mpm/dexter/Makefile.in b/server/mpm/dexter/Makefile.in
index 573c30d9a0f8fc4b09741d562a4a6064505c44e8..f26285106d9b9900ba58f959a5c736961e5ab35e 100644 (file)
--- a/server/mpm/dexter/Makefile.in
+++ b/server/mpm/dexter/Makefile.in
@@ -1,10 +1,10 @@
 
 DEPTH     = ../../..
-topsrcdir = @topsrcdir@
+top_srcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 LTLIBRARY_NAME    = libdexter.la
 LTLIBRARY_SOURCES = dexter.c scoreboard.c
 
-include $(topsrcdir)/build/ltlib.mk
+include $(top_srcdir)/build/ltlib.mk

diff --git a/server/mpm/mpmt_beos/Makefile.in b/server/mpm/mpmt_beos/Makefile.in
index 0abb81eb6238741666681db3b9a9b40c3e7b6b51..416703cd38c4b38dc37c71621b4f2edc557c1a44 100644 (file)
--- a/server/mpm/mpmt_beos/Makefile.in
+++ b/server/mpm/mpmt_beos/Makefile.in
@@ -1,10 +1,10 @@
 
 DEPTH     = ../../..
-topsrcdir = @topsrcdir@
+top_srcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 LTLIBRARY_NAME    = libmpmt_beos.la
 LTLIBRARY_SOURCES = mpmt_beos.c scoreboard.c acceptlock.c mutex.c poll.c
 
-include $(topsrcdir)/build/ltlib.mk
+include $(top_srcdir)/build/ltlib.mk

diff --git a/server/mpm/mpmt_pthread/Makefile.in b/server/mpm/mpmt_pthread/Makefile.in
index 0be6d53cd6a9edb1b29b20cdc574092db08af1b6..65a1cede97806b7feb2923637af0822b08bc04b6 100644 (file)
--- a/server/mpm/mpmt_pthread/Makefile.in
+++ b/server/mpm/mpmt_pthread/Makefile.in
@@ -1,10 +1,10 @@
 
 DEPTH     = ../../..
-topsrcdir = @topsrcdir@
+top_srcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 LTLIBRARY_NAME    = libmpmt_pthread.la
 LTLIBRARY_SOURCES = mpmt_pthread.c scoreboard.c
 
-include $(topsrcdir)/build/ltlib.mk
+include $(top_srcdir)/build/ltlib.mk

diff --git a/server/mpm/prefork/Makefile.in b/server/mpm/prefork/Makefile.in
index 5d086070f2c639a15101cac2f55d63c14cf85759..174e895ce99bc5c7fa0f052632620403cbd4322d 100644 (file)
--- a/server/mpm/prefork/Makefile.in
+++ b/server/mpm/prefork/Makefile.in
@@ -1,10 +1,10 @@
 
 DEPTH     = ../../..
-topsrcdir = @topsrcdir@
+top_srcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 LTLIBRARY_NAME    = libprefork.la
 LTLIBRARY_SOURCES = prefork.c
 
-include $(topsrcdir)/build/ltlib.mk
+include $(top_srcdir)/build/ltlib.mk

diff --git a/server/mpm/spmt_os2/Makefile.in b/server/mpm/spmt_os2/Makefile.in
index 081a91bf808f1b35d5e9e33ba79f93696850dd74..d9a5fa45938f1de72c7a500899cc66ef1d4cc14c 100644 (file)
--- a/server/mpm/spmt_os2/Makefile.in
+++ b/server/mpm/spmt_os2/Makefile.in
@@ -1,10 +1,10 @@
 
 DEPTH     = ../../..
-topsrcdir = @topsrcdir@
+top_srcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 LTLIBRARY_NAME    = libspmt_os2.la
 LTLIBRARY_SOURCES = spmt_os2.c
 
-include $(topsrcdir)/build/ltlib.mk
+include $(top_srcdir)/build/ltlib.mk

diff --git a/srclib/Makefile.in b/srclib/Makefile.in
index 5d725f2af1859031860eb53a9fb8ab2df23c4936..f4c8ca4ae7570a7364869410e1134df5c3675548 100644 (file)
--- a/srclib/Makefile.in
+++ b/srclib/Makefile.in
@@ -1,9 +1,9 @@
 
 DEPTH     = ..
-topsrcdir = @topsrcdir@
+top_srcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 SUBDIRS = apr
 
-include $(topsrcdir)/build/rules.mk
+include $(top_srcdir)/build/rules.mk