makefiles: Remove directory variables that are redundant with non-recursive make.

Makefile.in

@@ -30,8 +30,6 @@ includedir      = @includedir@
 fontdir         = ${datadir}/wine/fonts
 nlsdir          = ${datadir}/wine/nls
 dlldir          = ${libdir}/wine
-top_srcdir      = @top_srcdir@
-top_builddir    = @top_builddir@
 srcdir          = @srcdir@
 SHELL           = /bin/sh
 CC              = @CC@
@@ -111,7 +109,7 @@ distclean:: clean
 # Rules for API documentation
 
 install-manpages:: manpages
-	for i in documentation/man$(api_manext)/*.$(api_manext); do $(top_srcdir)/tools/install-sh -m 644 $(INSTALL_DATA_FLAGS) $$i $(DESTDIR)$(mandir)/$$i; done
+	for i in documentation/man$(api_manext)/*.$(api_manext); do $(srcdir)/tools/install-sh -m 644 $(INSTALL_DATA_FLAGS) $$i $(DESTDIR)$(mandir)/$$i; done
 
 .PHONY: install-manpages
 
@@ -136,8 +134,8 @@ TAGSFLAGS = --langmap='c:+.idl.l.rh,make:(Make*.in)'
 
 TAGS etags:
 	rm -f TAGS
-	(test -d .git && git ls-files || find -L $(top_srcdir) -name '*.[ch]' -print) | xargs etags -a $(TAGSFLAGS)
+	(test -d .git && git ls-files || find -L $(srcdir) -name '*.[ch]' -print) | xargs etags -a $(TAGSFLAGS)
 
 tags ctags:
 	rm -f tags
-	(test -d .git && git ls-files || find -L $(top_srcdir) -name '*.[ch]' -print) | xargs ctags -a $(TAGSFLAGS)
+	(test -d .git && git ls-files || find -L $(srcdir) -name '*.[ch]' -print) | xargs ctags -a $(TAGSFLAGS)

aclocal.m4

@@ -121,8 +121,6 @@ ac_save_CPPFLAGS=$CPPFLAGS
 CPPFLAGS="$CPPFLAGS $ac_cflags"
 $6
 CPPFLAGS=$ac_save_CPPFLAGS
-test -z "$ac_cflags" || ac_cflags=`echo " $ac_cflags" | sed 's/ -I\([[^/]]\)/ -I\$(top_builddir)\/\1/g'`
-test -z "$ac_libs" || ac_libs=`echo " $ac_libs" | sed 's/ -L\([[^/]]\)/ -L\$(top_builddir)\/\1/g'`
 AS_VAR_POPDEF([ac_libs])dnl
 AS_VAR_POPDEF([ac_cflags])])dnl
 

configure.ac

@@ -239,13 +239,10 @@ AC_CACHE_CHECK([for the directory containing the Wine tools], wine_cv_toolsdir,
    fi])
 if test -z "$wine_cv_toolsdir"; then
     wine_makedep=tools/makedep
-    AC_SUBST(TOOLSDIR,"\$(top_builddir)")
+    AC_SUBST(TOOLSDIR,".")
 elif test -d "$wine_cv_toolsdir/tools/winebuild"; then
     wine_makedep=$wine_cv_toolsdir/tools/makedep
-    case "$wine_cv_toolsdir" in
-       /*) AC_SUBST(TOOLSDIR,$wine_cv_toolsdir) ;;
-       *)  AC_SUBST(TOOLSDIR,"\$(top_builddir)/$wine_cv_toolsdir") ;;
-    esac
+    AC_SUBST(TOOLSDIR,$wine_cv_toolsdir)
     enable_tools=${enable_tools:-no}
     test -f "$wine_makedep" || AC_MSG_ERROR([the Wine tools have not yet been built in $wine_cv_toolsdir])
 else