From: Manoj Kasichainula Date: Wed, 15 Mar 2000 22:46:33 +0000 (+0000) Subject: Minor nit: use top_srcdir instead of topsrcdir, to be more consistent X-Git-Tag: APACHE_2_0_ALPHA_2~82 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ee839f0042791d633057376c079dd72ae88134ef;p=apache 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 6f161507b3..1d3e0890a5 100644 --- 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 bdf5b7d7b0..7f58e42455 100755 --- 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 f65c5bec25..7ebd54817a 100644 --- 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 a50a7a64dc..fdaa69c0aa 100644 --- 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 11abead2ca..ff610f3a1a 100644 --- 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 da8a82274b..11239ae8fb 100644 --- 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 ccd3c19755..3eeb709e0a 100644 --- 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 0e62c951ce..96234c1488 100644 --- 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 ea86214b21..d9b0c41068 100644 --- 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 c03ac3fca1..63e0fbb44d 100644 --- 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 82b2dfc8ca..66d164412c 100644 --- 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 dd10393ce6..114cd4abee 100644 --- 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 7f678e86bf..87897bb29f 100644 --- 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 573c30d9a0..f26285106d 100644 --- 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 0abb81eb62..416703cd38 100644 --- 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 0be6d53cd6..65a1cede97 100644 --- 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 5d086070f2..174e895ce9 100644 --- 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 081a91bf80..d9a5fa4593 100644 --- 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 5d725f2af1..f4c8ca4ae7 100644 --- 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