From 1047e0474d9e1ec872ce5f3451f16283c293369c Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Thu, 26 Dec 2013 13:24:26 +0100
Subject: [PATCH] makefiles: Leave it to install-sh to create destination
 directories.

---
 Make.rules.in               |  3 ---
 Makefile.in                 | 14 ++---------
 aclocal.m4                  | 20 ++++++++--------
 configure                   | 46 ++++++++++++++++---------------------
 configure.ac                | 20 ++++++++--------
 documentation/Makefile.in   |  8 +++----
 fonts/Makefile.in           |  4 +---
 include/Makefile.in         | 11 ++-------
 libs/wine/Makefile.in       |  2 --
 loader/Makefile.in          |  4 ----
 server/Makefile.in          |  4 +---
 tools/Makefile.in           |  8 ++-----
 tools/makedep.c             |  4 ++--
 tools/widl/Makefile.in      |  3 +--
 tools/winebuild/Makefile.in |  4 +---
 tools/winedump/Makefile.in  |  4 +---
 tools/winegcc/Makefile.in   |  4 +---
 tools/wmc/Makefile.in       |  4 +---
 tools/wrc/Makefile.in       |  4 +---
 19 files changed, 59 insertions(+), 112 deletions(-)

diff --git a/Make.rules.in b/Make.rules.in
index 3ae3b5b1553..afcf8de4e54 100644
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -109,9 +109,6 @@ clean::
 
 # Rules for installing
 
-$(INSTALLDIRS):
-	$(MKDIR_P) -m 755 $@
-
 install install-lib install-dev uninstall::
 
 .PHONY: install install-lib install-dev uninstall
diff --git a/Makefile.in b/Makefile.in
index 1a41d057cf1..2355df9e0b8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -18,13 +18,6 @@
 # sgmlpages:       compile sgml source for the Wine API Guide
 # xmlpages:        compile xml source for the Wine API Guide
 
-# Destination directories for make install
-INSTALLDIRS = \
-	$(DESTDIR)$(bindir) \
-	$(DESTDIR)$(dlldir) \
-	$(DESTDIR)$(fakedlldir) \
-	$(DESTDIR)$(mandir)/man$(prog_manext)
-
 all: wine
 	@echo "Wine build complete."
 
@@ -46,14 +39,11 @@ distclean:: clean
 	$(RM) config.* configure.lineno TAGS tags include/config.h include/stamp-h Makefile Make.tmp .gitignore
 	$(RM) -r autom4te.cache
 
-# Rules for installing
-
-$(INSTALLDIRS):
-	$(MKDIR_P) -m 755 $@
+# Rules for uninstalling
 
 .PHONY: install install-lib install-dev uninstall __uninstall__
 uninstall:: __uninstall__
-	-rmdir $(DESTDIR)$(datadir)/wine $(DESTDIR)$(fakedlldir) $(DESTDIR)$(dlldir)
+	-rmdir $(DESTDIR)$(datadir)/wine $(DESTDIR)$(fakedlldir) $(DESTDIR)$(dlldir) $(DESTDIR)$(includedir)
 
 # Dependencies between directories
 
diff --git a/aclocal.m4 b/aclocal.m4
index 9b88da3c124..300196bfc65 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -372,7 +372,7 @@ wine_fn_config_lib ()
 
     wine_fn_append_rule \
 ".PHONY: $ac_dir/install $ac_dir/uninstall
-$ac_dir/install:: $ac_dir \$(DESTDIR)\$(dlldir)
+$ac_dir/install:: $ac_dir
 	\$(INSTALL_DATA) $ac_dir/lib$ac_name.a \$(DESTDIR)\$(dlldir)/lib$ac_name.a
 $ac_dir/uninstall::
 	\$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_name.a
@@ -430,14 +430,14 @@ __uninstall__: $ac_dir/uninstall"
                 if test -n "$DLLEXT"
                 then
                     wine_fn_append_rule \
-"$ac_dir/install-lib:: $ac_dir \$(DESTDIR)\$(dlldir) \$(DESTDIR)\$(fakedlldir)
+"$ac_dir/install-lib:: $ac_dir
 	\$(INSTALL_PROGRAM) $ac_dir/$ac_dll$DLLEXT \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_dll$DLLEXT
 	\$(INSTALL_DATA) $ac_dir/$ac_dll.fake \$(DESTDIR)\$(fakedlldir)/$ac_dll
 $ac_dir/uninstall::
 	\$(RM) \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_dll$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_dll"
                 else
                     wine_fn_append_rule \
-"$ac_dir/install-lib:: $ac_dir \$(DESTDIR)\$(dlldir)
+"$ac_dir/install-lib:: $ac_dir
 	\$(INSTALL_PROGRAM) $ac_dir/$ac_dll \$(DESTDIR)\$(dlldir)/$ac_dll
 $ac_dir/uninstall::
 	\$(RM) \$(DESTDIR)\$(dlldir)/$ac_dll"
@@ -455,7 +455,7 @@ $ac_file.def: $srcdir/$ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD)
 $ac_file.$STATIC_IMPLIBEXT: $ac_dir/Makefile dummy
 	@cd $ac_dir && \$(MAKE) lib$ac_implib.$STATIC_IMPLIBEXT
 .PHONY: $ac_dir/install-dev $ac_dir/uninstall
-$ac_dir/install-dev:: $ac_file.$IMPLIBEXT \$(DESTDIR)\$(dlldir)
+$ac_dir/install-dev:: $ac_file.$IMPLIBEXT
 	\$(INSTALL_DATA) $ac_file.$IMPLIBEXT \$(DESTDIR)\$(dlldir)/lib$ac_implib.$IMPLIBEXT
 $ac_dir/uninstall::
 	\$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_implib.$IMPLIBEXT
@@ -465,7 +465,7 @@ __uninstall__: $ac_dir/uninstall"
         if test "$IMPLIBEXT" != "$STATIC_IMPLIBEXT"
         then
             wine_fn_append_rule \
-"$ac_dir/install-dev:: $ac_file.$STATIC_IMPLIBEXT \$(DESTDIR)\$(dlldir) __builddeps__
+"$ac_dir/install-dev:: $ac_file.$STATIC_IMPLIBEXT __builddeps__
 	\$(INSTALL_DATA) $ac_file.$STATIC_IMPLIBEXT \$(DESTDIR)\$(dlldir)/lib$ac_implib.$STATIC_IMPLIBEXT
 $ac_dir/uninstall::
 	\$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_implib.$STATIC_IMPLIBEXT"
@@ -488,7 +488,7 @@ $ac_file.def: $srcdir/$ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD)
 $ac_file.a: $srcdir/$ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD)
 	\$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --implib -o \$[@] --export $srcdir/$ac_dir/$ac_name.spec
 .PHONY: $ac_dir/install-dev $ac_dir/uninstall
-$ac_dir/install-dev:: $ac_file.$IMPLIBEXT \$(DESTDIR)\$(dlldir)
+$ac_dir/install-dev:: $ac_file.$IMPLIBEXT
 	\$(INSTALL_DATA) $ac_file.$IMPLIBEXT \$(DESTDIR)\$(dlldir)/lib$ac_implib.$IMPLIBEXT
 $ac_dir/uninstall::
 	\$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_implib.$IMPLIBEXT
@@ -560,7 +560,7 @@ __uninstall__: $ac_dir/uninstall"
     if test -n "$DLLEXT"
     then
         wine_fn_append_rule \
-"$ac_dir/install:: $ac_dir \$(DESTDIR)\$(dlldir) \$(DESTDIR)\$(fakedlldir)
+"$ac_dir/install:: $ac_dir
 	\$(INSTALL_PROGRAM) $ac_dir/$ac_program$DLLEXT \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_program$DLLEXT
 	\$(INSTALL_DATA) $ac_dir/$ac_program.fake \$(DESTDIR)\$(fakedlldir)/$ac_program
 $ac_dir/uninstall::
@@ -569,14 +569,14 @@ $ac_dir/uninstall::
         if test -z "$with_wine64" && wine_fn_has_flag installbin
         then
             wine_fn_append_rule \
-"$ac_dir/install:: __tooldeps__ \$(DESTDIR)\$(bindir)
+"$ac_dir/install:: __tooldeps__
 	\$(INSTALL_SCRIPT) \$(TOOLSDIR)/tools/wineapploader \$(DESTDIR)\$(bindir)/$ac_name
 $ac_dir/uninstall::
 	\$(RM) \$(DESTDIR)\$(bindir)/$ac_name"
         fi
     else
         wine_fn_append_rule \
-"$ac_dir/install:: $ac_dir \$(DESTDIR)\$(bindir)
+"$ac_dir/install:: $ac_dir
 	\$(INSTALL_PROGRAM) $ac_dir/$ac_program \$(DESTDIR)\$(bindir)/$ac_program
 $ac_dir/uninstall::
 	\$(RM) \$(DESTDIR)\$(bindir)/$ac_program"
@@ -585,7 +585,7 @@ $ac_dir/uninstall::
     if test -z "$with_wine64" && wine_fn_has_flag manpage
     then
         wine_fn_append_rule \
-"$ac_dir/install:: $ac_dir \$(DESTDIR)\$(mandir)/man\$(prog_manext)
+"$ac_dir/install:: $ac_dir
 	\$(INSTALL_DATA) $ac_dir/$ac_name.man \$(DESTDIR)\$(mandir)/man\$(prog_manext)/$ac_name.\$(prog_manext)
 $ac_dir/uninstall::
 	\$(RM) \$(DESTDIR)\$(mandir)/man\$(prog_manext)/$ac_name.\$(prog_manext)"
diff --git a/configure b/configure
index 8aa722df405..f2985a31d49 100755
--- a/configure
+++ b/configure
@@ -7240,7 +7240,7 @@ fi
 
     wine_fn_append_rule \
 ".PHONY: $ac_dir/install $ac_dir/uninstall
-$ac_dir/install:: $ac_dir \$(DESTDIR)\$(dlldir)
+$ac_dir/install:: $ac_dir
 	\$(INSTALL_DATA) $ac_dir/lib$ac_name.a \$(DESTDIR)\$(dlldir)/lib$ac_name.a
 $ac_dir/uninstall::
 	\$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_name.a
@@ -7301,14 +7301,14 @@ __uninstall__: $ac_dir/uninstall"
                 if test -n "$DLLEXT"
                 then
                     wine_fn_append_rule \
-"$ac_dir/install-lib:: $ac_dir \$(DESTDIR)\$(dlldir) \$(DESTDIR)\$(fakedlldir)
+"$ac_dir/install-lib:: $ac_dir
 	\$(INSTALL_PROGRAM) $ac_dir/$ac_dll$DLLEXT \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_dll$DLLEXT
 	\$(INSTALL_DATA) $ac_dir/$ac_dll.fake \$(DESTDIR)\$(fakedlldir)/$ac_dll
 $ac_dir/uninstall::
 	\$(RM) \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_dll$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_dll"
                 else
                     wine_fn_append_rule \
-"$ac_dir/install-lib:: $ac_dir \$(DESTDIR)\$(dlldir)
+"$ac_dir/install-lib:: $ac_dir
 	\$(INSTALL_PROGRAM) $ac_dir/$ac_dll \$(DESTDIR)\$(dlldir)/$ac_dll
 $ac_dir/uninstall::
 	\$(RM) \$(DESTDIR)\$(dlldir)/$ac_dll"
@@ -7327,7 +7327,7 @@ $ac_file.def: $srcdir/$ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD)
 $ac_file.$STATIC_IMPLIBEXT: $ac_dir/Makefile dummy
 	@cd $ac_dir && \$(MAKE) lib$ac_implib.$STATIC_IMPLIBEXT
 .PHONY: $ac_dir/install-dev $ac_dir/uninstall
-$ac_dir/install-dev:: $ac_file.$IMPLIBEXT \$(DESTDIR)\$(dlldir)
+$ac_dir/install-dev:: $ac_file.$IMPLIBEXT
 	\$(INSTALL_DATA) $ac_file.$IMPLIBEXT \$(DESTDIR)\$(dlldir)/lib$ac_implib.$IMPLIBEXT
 $ac_dir/uninstall::
 	\$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_implib.$IMPLIBEXT
@@ -7337,7 +7337,7 @@ __uninstall__: $ac_dir/uninstall"
         if test "$IMPLIBEXT" != "$STATIC_IMPLIBEXT"
         then
             wine_fn_append_rule \
-"$ac_dir/install-dev:: $ac_file.$STATIC_IMPLIBEXT \$(DESTDIR)\$(dlldir) __builddeps__
+"$ac_dir/install-dev:: $ac_file.$STATIC_IMPLIBEXT __builddeps__
 	\$(INSTALL_DATA) $ac_file.$STATIC_IMPLIBEXT \$(DESTDIR)\$(dlldir)/lib$ac_implib.$STATIC_IMPLIBEXT
 $ac_dir/uninstall::
 	\$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_implib.$STATIC_IMPLIBEXT"
@@ -7360,7 +7360,7 @@ $ac_file.def: $srcdir/$ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD)
 $ac_file.a: $srcdir/$ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD)
 	\$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --implib -o \$@ --export $srcdir/$ac_dir/$ac_name.spec
 .PHONY: $ac_dir/install-dev $ac_dir/uninstall
-$ac_dir/install-dev:: $ac_file.$IMPLIBEXT \$(DESTDIR)\$(dlldir)
+$ac_dir/install-dev:: $ac_file.$IMPLIBEXT
 	\$(INSTALL_DATA) $ac_file.$IMPLIBEXT \$(DESTDIR)\$(dlldir)/lib$ac_implib.$IMPLIBEXT
 $ac_dir/uninstall::
 	\$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_implib.$IMPLIBEXT
@@ -7434,7 +7434,7 @@ __uninstall__: $ac_dir/uninstall"
     if test -n "$DLLEXT"
     then
         wine_fn_append_rule \
-"$ac_dir/install:: $ac_dir \$(DESTDIR)\$(dlldir) \$(DESTDIR)\$(fakedlldir)
+"$ac_dir/install:: $ac_dir
 	\$(INSTALL_PROGRAM) $ac_dir/$ac_program$DLLEXT \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_program$DLLEXT
 	\$(INSTALL_DATA) $ac_dir/$ac_program.fake \$(DESTDIR)\$(fakedlldir)/$ac_program
 $ac_dir/uninstall::
@@ -7443,14 +7443,14 @@ $ac_dir/uninstall::
         if test -z "$with_wine64" && wine_fn_has_flag installbin
         then
             wine_fn_append_rule \
-"$ac_dir/install:: __tooldeps__ \$(DESTDIR)\$(bindir)
+"$ac_dir/install:: __tooldeps__
 	\$(INSTALL_SCRIPT) \$(TOOLSDIR)/tools/wineapploader \$(DESTDIR)\$(bindir)/$ac_name
 $ac_dir/uninstall::
 	\$(RM) \$(DESTDIR)\$(bindir)/$ac_name"
         fi
     else
         wine_fn_append_rule \
-"$ac_dir/install:: $ac_dir \$(DESTDIR)\$(bindir)
+"$ac_dir/install:: $ac_dir
 	\$(INSTALL_PROGRAM) $ac_dir/$ac_program \$(DESTDIR)\$(bindir)/$ac_program
 $ac_dir/uninstall::
 	\$(RM) \$(DESTDIR)\$(bindir)/$ac_program"
@@ -7459,7 +7459,7 @@ $ac_dir/uninstall::
     if test -z "$with_wine64" && wine_fn_has_flag manpage
     then
         wine_fn_append_rule \
-"$ac_dir/install:: $ac_dir \$(DESTDIR)\$(mandir)/man\$(prog_manext)
+"$ac_dir/install:: $ac_dir
 	\$(INSTALL_DATA) $ac_dir/$ac_name.man \$(DESTDIR)\$(mandir)/man\$(prog_manext)/$ac_name.\$(prog_manext)
 $ac_dir/uninstall::
 	\$(RM) \$(DESTDIR)\$(mandir)/man\$(prog_manext)/$ac_name.\$(prog_manext)"
@@ -7565,7 +7565,7 @@ wine_fn_ignore_file "libs/wine/version.c"
 LOADER_RULES="
 all: $wine_binary wine-installed
 
-install install-lib:: wine-installed \$(DESTDIR)\$(bindir)
+install install-lib:: wine-installed
 	\$(INSTALL_PROGRAM) wine-installed \$(DESTDIR)\$(bindir)/$wine_binary
 
 uninstall::
@@ -7700,10 +7700,10 @@ libwine.a: \$(srcdir)/wine.def
 libwine.dll: \$(OBJS) \$(srcdir)/wine.def
 	\$(CC) -shared \$(srcdir)/wine.def -o \$@ \$(OBJS) $crtlibs \$(EXTRALIBS)
 
-install install-lib:: libwine.dll \$(DESTDIR)\$(libdir) dummy
+install install-lib:: libwine.dll
 	\$(INSTALL_DATA) libwine.dll \$(DESTDIR)\$(libdir)/libwine.dll
 
-install install-dev:: libwine.a \$(DESTDIR)\$(libdir) dummy
+install install-dev:: libwine.a
 	\$(INSTALL_DATA) libwine.a \$(DESTDIR)\$(libdir)/libwine.a
 
 uninstall::
@@ -7899,11 +7899,11 @@ libwine.\$(SOVERSION).dylib: libwine.\$(VERSION).dylib
 libwine.dylib: libwine.\$(SOVERSION).dylib
 	\$(RM) \$@ && \$(LN_S) libwine.\$(SOVERSION).dylib \$@
 
-install install-lib:: libwine.\$(VERSION).dylib \$(DESTDIR)\$(libdir) dummy
+install install-lib:: libwine.\$(VERSION).dylib
 	\$(INSTALL_PROGRAM) libwine.\$(VERSION).dylib \$(DESTDIR)\$(libdir)/libwine.\$(VERSION).dylib
 	cd \$(DESTDIR)\$(libdir) && \$(RM) libwine.\$(SOVERSION).dylib && \$(LN_S) libwine.\$(VERSION).dylib libwine.\$(SOVERSION).dylib
 
-install install-dev:: \$(DESTDIR)\$(libdir) dummy
+install install-dev::
 	cd \$(DESTDIR)\$(libdir) && \$(RM) libwine.dylib && \$(LN_S) libwine.\$(VERSION).dylib libwine.dylib
 
 uninstall::
@@ -8074,7 +8074,7 @@ all: libwine.so
 libwine.so: \$(OBJS)
 	\$(CC) -shared \$(OBJS) \$(EXTRALIBS) \$(LDFLAGS) \$(LIBS) -o \$@
 
-install install-lib:: libwine.so \$(DESTDIR)\$(libdir) dummy
+install install-lib:: libwine.so
 	\$(INSTALL_PROGRAM) libwine.so \$(DESTDIR)\$(libdir)/libwine.so
 
 uninstall::
@@ -8432,11 +8432,11 @@ libwine.so.\$(SOVERSION): libwine.so.\$(VERSION)
 libwine.so: libwine.so.\$(SOVERSION)
 	\$(RM) \$@ && \$(LN_S) libwine.so.\$(SOVERSION) \$@
 
-install install-lib:: libwine.so.\$(VERSION) \$(DESTDIR)\$(libdir) dummy
+install install-lib:: libwine.so.\$(VERSION)
 	\$(INSTALL_PROGRAM) libwine.so.\$(VERSION) \$(DESTDIR)\$(libdir)/libwine.so.\$(VERSION)
 	cd \$(DESTDIR)\$(libdir) && \$(RM) libwine.so.\$(SOVERSION) && \$(LN_S) libwine.so.\$(VERSION) libwine.so.\$(SOVERSION)
 
-install install-dev:: \$(DESTDIR)\$(libdir) dummy
+install install-dev::
 	cd \$(DESTDIR)\$(libdir) && \$(RM) libwine.so && \$(LN_S) libwine.so.\$(VERSION) libwine.so
 
 uninstall::
@@ -14419,7 +14419,7 @@ all: $wine_binary-preloader
 $wine_binary-preloader: preloader.o
 	\$(CC) -o \$@ -static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c400000 preloader.o \$(LIBPORT) \$(LDFLAGS)
 
-install install-lib:: $wine_binary-preloader \$(DESTDIR)\$(bindir)
+install install-lib:: $wine_binary-preloader
 	\$(INSTALL_PROGRAM) $wine_binary-preloader \$(DESTDIR)\$(bindir)/$wine_binary-preloader
 
 uninstall::
@@ -17530,7 +17530,7 @@ else
     as_fn_append LOADER_RULES "
 all: wine.inf
 
-install install-lib:: wine.inf \$(DESTDIR)\$(datadir)/wine install-man-pages
+install install-lib:: wine.inf install-man-pages
 	\$(INSTALL_DATA) wine.inf \$(DESTDIR)\$(datadir)/wine/wine.inf
 	\$(INSTALL_DATA) \$(srcdir)/l_intl.nls \$(DESTDIR)\$(datadir)/wine/l_intl.nls
 
@@ -18133,7 +18133,6 @@ gives unlimited permission to copy, distribute and modify it."
 
 ac_pwd='$ac_pwd'
 srcdir='$srcdir'
-INSTALL='$INSTALL'
 MKDIR_P='$MKDIR_P'
 test -n "\$AWK" || AWK=awk
 _ACEOF
@@ -18758,10 +18757,6 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
   # CONFIG_FILE
   #
 
-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
-  esac
   ac_MKDIR_P=$MKDIR_P
   case $MKDIR_P in
   [\\/$]* | ?:[\\/]* ) ;;
@@ -18820,7 +18815,6 @@ s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
 s&@builddir@&$ac_builddir&;t t
 s&@abs_builddir@&$ac_abs_builddir&;t t
 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-s&@INSTALL@&$ac_INSTALL&;t t
 s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
 "
diff --git a/configure.ac b/configure.ac
index bbf8258a700..113eeea0403 100644
--- a/configure.ac
+++ b/configure.ac
@@ -692,7 +692,7 @@ WINE_IGNORE_FILE("libs/wine/version.c")
 AC_SUBST(LOADER_RULES,["
 all: $wine_binary wine-installed
 
-install install-lib:: wine-installed \$(DESTDIR)\$(bindir)
+install install-lib:: wine-installed
 	\$(INSTALL_PROGRAM) wine-installed \$(DESTDIR)\$(bindir)/$wine_binary
 
 uninstall::
@@ -737,10 +737,10 @@ libwine.a: \$(srcdir)/wine.def
 libwine.dll: \$(OBJS) \$(srcdir)/wine.def
 	\$(CC) -shared \$(srcdir)/wine.def -o \$@ \$(OBJS) $crtlibs \$(EXTRALIBS)
 
-install install-lib:: libwine.dll \$(DESTDIR)\$(libdir) dummy
+install install-lib:: libwine.dll
 	\$(INSTALL_DATA) libwine.dll \$(DESTDIR)\$(libdir)/libwine.dll
 
-install install-dev:: libwine.a \$(DESTDIR)\$(libdir) dummy
+install install-dev:: libwine.a
 	\$(INSTALL_DATA) libwine.a \$(DESTDIR)\$(libdir)/libwine.a
 
 uninstall::
@@ -868,11 +868,11 @@ libwine.\$(SOVERSION).dylib: libwine.\$(VERSION).dylib
 libwine.dylib: libwine.\$(SOVERSION).dylib
 	\$(RM) \$@ && \$(LN_S) libwine.\$(SOVERSION).dylib \$@
 
-install install-lib:: libwine.\$(VERSION).dylib \$(DESTDIR)\$(libdir) dummy
+install install-lib:: libwine.\$(VERSION).dylib
 	\$(INSTALL_PROGRAM) libwine.\$(VERSION).dylib \$(DESTDIR)\$(libdir)/libwine.\$(VERSION).dylib
 	cd \$(DESTDIR)\$(libdir) && \$(RM) libwine.\$(SOVERSION).dylib && \$(LN_S) libwine.\$(VERSION).dylib libwine.\$(SOVERSION).dylib
 
-install install-dev:: \$(DESTDIR)\$(libdir) dummy
+install install-dev::
 	cd \$(DESTDIR)\$(libdir) && \$(RM) libwine.dylib && \$(LN_S) libwine.\$(VERSION).dylib libwine.dylib
 
 uninstall::
@@ -922,7 +922,7 @@ all: libwine.so
 libwine.so: \$(OBJS)
 	\$(CC) -shared \$(OBJS) \$(EXTRALIBS) \$(LDFLAGS) \$(LIBS) -o \$@
 
-install install-lib:: libwine.so \$(DESTDIR)\$(libdir) dummy
+install install-lib:: libwine.so
 	\$(INSTALL_PROGRAM) libwine.so \$(DESTDIR)\$(libdir)/libwine.so
 
 uninstall::
@@ -1011,11 +1011,11 @@ libwine.so.\$(SOVERSION): libwine.so.\$(VERSION)
 libwine.so: libwine.so.\$(SOVERSION)
 	\$(RM) \$@ && \$(LN_S) libwine.so.\$(SOVERSION) \$@
 
-install install-lib:: libwine.so.\$(VERSION) \$(DESTDIR)\$(libdir) dummy
+install install-lib:: libwine.so.\$(VERSION)
 	\$(INSTALL_PROGRAM) libwine.so.\$(VERSION) \$(DESTDIR)\$(libdir)/libwine.so.\$(VERSION)
 	cd \$(DESTDIR)\$(libdir) && \$(RM) libwine.so.\$(SOVERSION) && \$(LN_S) libwine.so.\$(VERSION) libwine.so.\$(SOVERSION)
 
-install install-dev:: \$(DESTDIR)\$(libdir) dummy
+install install-dev::
 	cd \$(DESTDIR)\$(libdir) && \$(RM) libwine.so && \$(LN_S) libwine.so.\$(VERSION) libwine.so
 
 uninstall::
@@ -2007,7 +2007,7 @@ all: $wine_binary-preloader
 $wine_binary-preloader: preloader.o
 	\$(CC) -o \$@ -static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c400000 preloader.o \$(LIBPORT) \$(LDFLAGS)
 
-install install-lib:: $wine_binary-preloader \$(DESTDIR)\$(bindir)
+install install-lib:: $wine_binary-preloader
 	\$(INSTALL_PROGRAM) $wine_binary-preloader \$(DESTDIR)\$(bindir)/$wine_binary-preloader
 
 uninstall::
@@ -3584,7 +3584,7 @@ else
     AS_VAR_APPEND([LOADER_RULES],["
 all: wine.inf
 
-install install-lib:: wine.inf \$(DESTDIR)\$(datadir)/wine install-man-pages
+install install-lib:: wine.inf install-man-pages
 	\$(INSTALL_DATA) wine.inf \$(DESTDIR)\$(datadir)/wine/wine.inf
 	\$(INSTALL_DATA) \$(srcdir)/l_intl.nls \$(DESTDIR)\$(datadir)/wine/l_intl.nls
 
diff --git a/documentation/Makefile.in b/documentation/Makefile.in
index 5b641cf94ae..f5a2b716c15 100644
--- a/documentation/Makefile.in
+++ b/documentation/Makefile.in
@@ -1,10 +1,8 @@
-INSTALLDIRS = $(DESTDIR)$(mandir)/man$(api_manext)
-
-@MAKE_RULES@
-
-install-man:: $(DESTDIR)$(mandir)/man$(api_manext)
+install-man::
 	@cd $(top_builddir) && $(MAKE) manpages
 	for i in man$(api_manext)/*.$(api_manext); do $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/$$i; done
 
 clean::
 	$(RM) -r html api-guide api-guide-xml man$(api_manext)
+
+@MAKE_RULES@
diff --git a/fonts/Makefile.in b/fonts/Makefile.in
index 43ad860e9c0..1354dc07567 100644
--- a/fonts/Makefile.in
+++ b/fonts/Makefile.in
@@ -1,5 +1,3 @@
-INSTALLDIRS = $(DESTDIR)$(fontdir)
-
 BITMAP_FONTS  = \
 	coue1255.fon \
 	coue1256.fon \
@@ -215,7 +213,7 @@ cvgasys.fon: $(srcdir)/system.ttf
 
 $(BITMAP_FONTS): $(SFNT2FNT)
 
-install install-lib:: $(BITMAP_FONTS) $(INSTALLDIRS)
+install install-lib:: $(BITMAP_FONTS)
 	for i in $(BITMAP_FONTS); do $(INSTALL_DATA) $$i $(DESTDIR)$(fontdir)/$$i || exit 1; done
 	for i in $(TRUETYPE_FONTS); do $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(fontdir)/$$i || exit 1; done
 
diff --git a/include/Makefile.in b/include/Makefile.in
index 460c3c2cdb8..404c5ce5e5f 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -629,13 +629,6 @@ SRCDIR_INCLUDES = \
 	xmldsodid.h \
 	zmouse.h
 
-INSTALLDIRS = \
-	$(DESTDIR)$(includedir)/windows/ddk \
-	$(DESTDIR)$(includedir)/windows \
-	$(DESTDIR)$(includedir)/msvcrt/sys \
-	$(DESTDIR)$(includedir)/msvcrt \
-	$(DESTDIR)$(includedir)
-
 IDL_H_SRCS = $(PUBLIC_IDL_H_SRCS) $(PRIVATE_IDL_H_SRCS)
 
 @MAKE_RULES@
@@ -644,7 +637,7 @@ OBJDIR_INCLUDES = $(PUBLIC_IDL_H_SRCS:.idl=.h) $(XTEMPLATE_SRCS:.x=.h)
 
 all: $(IDL_H_SRCS:.idl=.h) $(IDL_TLB_SRCS:.idl=.tlb) $(XTEMPLATE_SRCS:.x=.h)
 
-install install-dev:: $(OBJDIR_INCLUDES) $(INSTALLDIRS)
+install install-dev:: $(OBJDIR_INCLUDES)
 	for f in $(SRCDIR_INCLUDES); do case $$f in \
 	  wine/*)   $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(includedir)/`expr $$f : 'wine/\(.*\)'` ;; \
 	  msvcrt/*) $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(includedir)/$$f ;; \
@@ -664,4 +657,4 @@ uninstall::
 	  msvcrt/*) $(RM) $(DESTDIR)$(includedir)/$$f ;; \
 	  *)        $(RM) $(DESTDIR)$(includedir)/windows/$$f ;; \
 	esac; done
-	-rmdir $(INSTALLDIRS)
+	-rmdir $(DESTDIR)$(includedir)/windows/ddk $(DESTDIR)$(includedir)/windows $(DESTDIR)$(includedir)/msvcrt/sys $(DESTDIR)$(includedir)/msvcrt
diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in
index b8bf68677a4..9d58f08618e 100644
--- a/libs/wine/Makefile.in
+++ b/libs/wine/Makefile.in
@@ -13,8 +13,6 @@ STATICLIB = libwine_static.a
 VERSION   = 1.0
 SOVERSION = 1
 
-INSTALLDIRS = $(DESTDIR)$(libdir)
-
 C_SRCS = \
 	c_037.c \
 	c_10000.c \
diff --git a/loader/Makefile.in b/loader/Makefile.in
index 37104a7349b..de3d4f8c68f 100644
--- a/loader/Makefile.in
+++ b/loader/Makefile.in
@@ -22,10 +22,6 @@ IN_SRCS = \
 	wine.inf.in \
 	wine_info.plist.in
 
-INSTALLDIRS = \
-	$(DESTDIR)$(bindir) \
-	$(DESTDIR)$(datadir)/wine
-
 @MAKE_RULES@
 
 @LOADER_RULES@
diff --git a/server/Makefile.in b/server/Makefile.in
index 9711cac074d..ea19dc4b127 100644
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -52,8 +52,6 @@ MANPAGES = \
 	wineserver.fr.UTF-8.man.in \
 	wineserver.man.in
 
-INSTALLDIRS = $(DESTDIR)$(bindir)
-
 all: $(PROGRAMS)
 
 @MAKE_RULES@
@@ -64,7 +62,7 @@ wineserver: $(OBJS)
 wineserver-installed: $(OBJS)
 	$(CC) -o $@ $(OBJS) $(LIBWINE) $(LIBPORT) $(LDFLAGS) $(EXTRALIBS) $(LIBS) $(LDRPATH_INSTALL)
 
-install install-lib:: wineserver-installed $(DESTDIR)$(bindir) install-man-pages
+install install-lib:: wineserver-installed install-man-pages
 	$(INSTALL_PROGRAM) wineserver-installed $(DESTDIR)$(bindir)/wineserver
 
 uninstall::
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 6d889b08d02..5cfa005c199 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -23,10 +23,6 @@ C_SRCS = \
 IN_SRCS = \
 	wineapploader.in
 
-INSTALLDIRS = \
-	$(DESTDIR)$(bindir) \
-	$(DESTDIR)$(datadir)/applications
-
 UPDATE_DESKTOP_DATABASE = update-desktop-database
 
 all: $(PROGRAMS)
@@ -45,11 +41,11 @@ fnt2fon$(EXEEXT): fnt2fon.o
 sfnt2fnt$(EXEEXT): sfnt2fnt.o
 	$(CC) $(CFLAGS) -o $@ sfnt2fnt.o $(LIBWINE_STATIC) $(LIBPORT) $(LDFLAGS) $(FREETYPELIBS)
 
-install install-lib:: $(DESTDIR)$(datadir)/applications
+install install-lib::
 	$(INSTALL_DATA) $(srcdir)/wine.desktop $(DESTDIR)$(datadir)/applications/wine.desktop
 	-$(UPDATE_DESKTOP_DATABASE)
 
-install install-dev:: $(DESTDIR)$(bindir) install-man-pages
+install install-dev:: install-man-pages
 	$(INSTALL_SCRIPT) $(srcdir)/winemaker $(DESTDIR)$(bindir)/winemaker
 
 uninstall::
diff --git a/tools/makedep.c b/tools/makedep.c
index d580c6a7491..099eff6fbe2 100644
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -1491,14 +1491,14 @@ static struct strarray output_sources(void)
                     dir = strmake( "$(DESTDIR)$(mandir)/%s/man%s", lang, source->sourcename );
                 }
                 else dir = strmake( "$(DESTDIR)$(mandir)/man%s", source->sourcename );
-                output( "install-man-pages:: %s %s\n", obj, dir );
+                output( "install-man-pages:: %s\n", obj );
                 output( "\t$(INSTALL_DATA) %s %s/%s.%s\n",
                         obj, dir, dest, source->sourcename );
                 output( "uninstall::\n" );
                 output( "\t$(RM) %s/%s.%s\n",
                         dir, dest, source->sourcename );
                 free( dest );
-                strarray_add_uniq( &subdirs, dir );
+                free( dir );
             }
             strarray_add( &clean_files, xstrdup(obj) );
             output( "%s: %s\n", obj, sourcedep );
diff --git a/tools/widl/Makefile.in b/tools/widl/Makefile.in
index 6c80562e801..01c22e60d8c 100644
--- a/tools/widl/Makefile.in
+++ b/tools/widl/Makefile.in
@@ -20,7 +20,6 @@ LEX_SRCS   = parser.l
 BISON_SRCS = parser.y
 
 EXTRADEFS   = -DDEFAULT_INCLUDE_DIR=\"$(includedir)/windows/\"
-INSTALLDIRS = $(DESTDIR)$(bindir)
 
 all: $(PROGRAMS)
 
@@ -29,7 +28,7 @@ all: $(PROGRAMS)
 widl$(EXEEXT): $(OBJS) $(LIBWPP)
 	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBWPP) $(LIBPORT) $(LDFLAGS)
 
-install install-dev:: $(PROGRAMS) $(DESTDIR)$(bindir) install-man-pages
+install install-dev:: $(PROGRAMS) install-man-pages
 	$(INSTALL_PROGRAM) widl$(EXEEXT) $(DESTDIR)$(bindir)/widl$(EXEEXT)
 
 uninstall::
diff --git a/tools/winebuild/Makefile.in b/tools/winebuild/Makefile.in
index 37d5d2c751d..bcd7c8cbaa1 100644
--- a/tools/winebuild/Makefile.in
+++ b/tools/winebuild/Makefile.in
@@ -12,8 +12,6 @@ C_SRCS = \
 	spec32.c \
 	utils.c
 
-INSTALLDIRS = $(DESTDIR)$(bindir)
-
 all: $(PROGRAMS)
 
 @MAKE_RULES@
@@ -21,7 +19,7 @@ all: $(PROGRAMS)
 winebuild$(EXEEXT): $(OBJS)
 	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBPORT) $(LDFLAGS)
 
-install install-dev:: $(PROGRAMS) $(DESTDIR)$(bindir) install-man-pages
+install install-dev:: $(PROGRAMS) install-man-pages
 	$(INSTALL_PROGRAM) winebuild$(EXEEXT) $(DESTDIR)$(bindir)/winebuild$(EXEEXT)
 
 uninstall::
diff --git a/tools/winedump/Makefile.in b/tools/winedump/Makefile.in
index f8ba0f45206..421baa12d76 100644
--- a/tools/winedump/Makefile.in
+++ b/tools/winedump/Makefile.in
@@ -23,8 +23,6 @@ C_SRCS = \
 	symbol.c \
 	tlb.c
 
-INSTALLDIRS = $(DESTDIR)$(bindir)
-
 all: $(PROGRAMS)
 
 @MAKE_RULES@
@@ -32,7 +30,7 @@ all: $(PROGRAMS)
 winedump$(EXEEXT): $(OBJS)
 	$(CC) $(CFLAGS) -o winedump$(EXEEXT) $(OBJS) $(LIBPORT) $(LDFLAGS)
 
-install install-dev:: $(PROGRAMS) $(DESTDIR)$(bindir) install-man-pages
+install install-dev:: $(PROGRAMS) install-man-pages
 	$(INSTALL_PROGRAM) winedump$(EXEEXT) $(DESTDIR)$(bindir)/winedump$(EXEEXT)
 	$(INSTALL_SCRIPT) $(srcdir)/function_grep.pl $(DESTDIR)$(bindir)/function_grep.pl
 
diff --git a/tools/winegcc/Makefile.in b/tools/winegcc/Makefile.in
index d80a4764813..074a972e7c3 100644
--- a/tools/winegcc/Makefile.in
+++ b/tools/winegcc/Makefile.in
@@ -18,8 +18,6 @@ C_SRCS = \
 	utils.c \
 	winegcc.c
 
-INSTALLDIRS = $(DESTDIR)$(bindir)
-
 all: $(PROGRAMS)
 
 @MAKE_RULES@
@@ -30,7 +28,7 @@ winegcc$(EXEEXT): winegcc.o utils.o
 winecpp$(EXEEXT) wineg++$(EXEEXT): winegcc$(EXEEXT)
 	$(RM) $@ && $(LN_S) winegcc$(EXEEXT) $@
 
-install install-dev:: $(PROGRAMS) $(DESTDIR)$(bindir) install-man-pages
+install install-dev:: $(PROGRAMS) install-man-pages
 	$(INSTALL_PROGRAM) winegcc$(EXEEXT) $(DESTDIR)$(bindir)/winegcc$(EXEEXT)
 	cd $(DESTDIR)$(bindir) && $(RM) wineg++$(EXEEXT) && $(LN_S) winegcc$(EXEEXT) wineg++$(EXEEXT)
 	cd $(DESTDIR)$(bindir) && $(RM) winecpp$(EXEEXT) && $(LN_S) winegcc$(EXEEXT) winecpp$(EXEEXT)
diff --git a/tools/wmc/Makefile.in b/tools/wmc/Makefile.in
index a221de6c4ba..fcf8212522f 100644
--- a/tools/wmc/Makefile.in
+++ b/tools/wmc/Makefile.in
@@ -12,8 +12,6 @@ C_SRCS = \
 
 BISON_SRCS = mcy.y
 
-INSTALLDIRS = $(DESTDIR)$(bindir)
-
 all: $(PROGRAMS)
 
 @MAKE_RULES@
@@ -21,7 +19,7 @@ all: $(PROGRAMS)
 wmc$(EXEEXT): $(OBJS)
 	$(CC) $(CFLAGS) -o $@ $(OBJS) $(ALL_LIBS) $(LDFLAGS)
 
-install install-dev:: wmc$(EXEEXT) $(DESTDIR)$(bindir) install-man-pages
+install install-dev:: wmc$(EXEEXT) install-man-pages
 	$(INSTALL_PROGRAM) wmc$(EXEEXT) $(DESTDIR)$(bindir)/wmc$(EXEEXT)
 
 uninstall::
diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in
index 9f3de930efe..8a74f6454b9 100644
--- a/tools/wrc/Makefile.in
+++ b/tools/wrc/Makefile.in
@@ -17,8 +17,6 @@ C_SRCS = \
 LEX_SRCS   = parser.l
 BISON_SRCS = parser.y
 
-INSTALLDIRS = $(DESTDIR)$(bindir)
-
 all: $(PROGRAMS)
 
 @MAKE_RULES@
@@ -26,7 +24,7 @@ all: $(PROGRAMS)
 wrc$(EXEEXT): $(OBJS) $(LIBWPP)
 	$(CC) $(CFLAGS) -o $@ $(OBJS) $(ALL_LIBS) $(LDFLAGS)
 
-install install-dev:: wrc$(EXEEXT) $(DESTDIR)$(bindir) install-man-pages
+install install-dev:: wrc$(EXEEXT) install-man-pages
 	$(INSTALL_PROGRAM) wrc$(EXEEXT) $(DESTDIR)$(bindir)/wrc$(EXEEXT)
 
 uninstall::