Commit 53e748b3 authored by Manoj Kasichainula's avatar Manoj Kasichainula
Browse files

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
parent d670a5e0

Makefile.in

+3 −3
Changes for Makefile.in: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line 


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

build/fastgen.sh

+4 −4
Changes for build/fastgen.sh: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -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

build/ltlib.mk

+2 −2
Changes for build/ltlib.mk: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -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

build/rules.mk

+0 −1
Changes for build/rules.mk: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -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:

build/special.mk

+1 −1
Changes for build/special.mk: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -77,5 +77,5 @@ install-modules: 
		done; \

	fi	



include $(topsrcdir)/build/rules.mk

include $(top_srcdir)/build/rules.mk