makefiles: Use make dependencies to create installation directories.

This avoids a lot of redundant calls to mkinstalldirs.

Make.rules.in

@@ -243,6 +243,9 @@ install:: $(INSTALLSUBDIRS:%=%/__install__)
 
 uninstall:: $(INSTALLSUBDIRS:%=%/__uninstall__)
 
+$(INSTALLDIRS):
+	$(MKINSTALLDIRS) $@
+
 .PHONY: install install-lib install-dev uninstall \
 	$(SUBDIRS:%=%/__install__) $(SUBDIRS:%=%/__uninstall__) \
 	$(SUBDIRS:%=%/__install-lib__) $(SUBDIRS:%=%/__install-dev__)

Makefile.in

@@ -63,6 +63,8 @@ all: Make.rules wine
 
 WINAPI_CHECK_EXTRA_FLAGS = --global
 
+INSTALLDIRS = $(DESTDIR)$(datadir)/aclocal
+
 @MAKE_RULES@
 
 Make.rules: Make.rules.in configure
@@ -74,22 +76,17 @@ wine: $(WINEWRAPPER)
 
 # Installation rules
 
-install-aclocal: dummy
+install install-dev:: $(DESTDIR)$(datadir)/aclocal dummy
-	$(MKINSTALLDIRS) $(DESTDIR)$(datadir)/aclocal
 	$(INSTALL_DATA) $(SRCDIR)/aclocal.m4 $(DESTDIR)$(datadir)/aclocal/wine.m4
 
-install-lib:: $(INSTALLLIBSUBDIRS:%=%/__install__) $(INSTALLBOTHSUBDIRS:%=%/__install-lib__)
+install install-lib:: $(INSTALLLIBSUBDIRS:%=%/__install__) $(INSTALLBOTHSUBDIRS:%=%/__install-lib__)
 
-install-dev:: $(INSTALLDEVSUBDIRS:%=%/__install__) $(INSTALLBOTHSUBDIRS:%=%/__install-dev__) install-aclocal
+install install-dev:: $(INSTALLDEVSUBDIRS:%=%/__install__) $(INSTALLBOTHSUBDIRS:%=%/__install-dev__)
-
-install:: install-lib install-dev install-aclocal
 
 uninstall:: $(INSTALLBOTHSUBDIRS:%=%/__uninstall__)
 	$(RM) $(DESTDIR)$(datadir)/aclocal/wine.m4
 	-rmdir $(DESTDIR)$(datadir)/wine $(DESTDIR)$(datadir)/aclocal
 
-.PHONY: install-aclocal
-
 # Dependencies between directories
 
 all: $(INSTALLSUBDIRS) $(INSTALLBOTHSUBDIRS)

dlls/Makedll.rules.in

@@ -24,6 +24,7 @@ ALL_IMPORTS = $(DELAYIMPORTS) $(IMPORTS)
 IMPLIB_OBJS = $(IMPLIB_SRCS:.c=.o)
 STATICIMPLIB= $(IMPORTLIB:.def=.def.a)
 DLL_LDPATH  = -L$(DLLDIR) $(ALL_IMPORTS:%=-L$(DLLDIR)/%)
+INSTALLDIRS = $(DESTDIR)$(dlldir) $(DESTDIR)$(datadir)/wine
 
 all: $(MODULE)$(DLLEXT) $(SUBDIRS)
 
@@ -111,16 +112,13 @@ WIN16_INSTALL = $(ALL_SPECS16:%=_install_/%)
 $(ALL_SPECS16:%=_install_/%): install_lib
 	echo "$(MODULE)" > $(DESTDIR)$(dlldir)/`basename $@`
 
-install_lib: $(MODULE)$(DLLEXT)
+install_lib: $(MODULE)$(DLLEXT) $(DESTDIR)$(dlldir)
-	$(MKINSTALLDIRS) $(DESTDIR)$(dlldir)
 	$(INSTALL_PROGRAM) $(MODULE)$(DLLEXT) $(DESTDIR)$(dlldir)/$(MODULE)$(DLLEXT)
 
-$(IMPORTLIB:%=_install_/%): $(IMPORTLIB)
+$(IMPORTLIB:%=_install_/%): $(IMPORTLIB) $(DESTDIR)$(dlldir)
-	$(MKINSTALLDIRS) $(DESTDIR)$(dlldir)
 	$(INSTALL_DATA) $(IMPORTLIB) $(DESTDIR)$(dlldir)/$(IMPORTLIB)
 
-install_static_implib_def: $(STATICIMPLIB)
+install_static_implib_def: $(STATICIMPLIB) $(DESTDIR)$(dlldir)
-	$(MKINSTALLDIRS) $(DESTDIR)$(dlldir)
 	$(INSTALL_DATA) $(STATICIMPLIB) $(DESTDIR)$(dlldir)/$(STATICIMPLIB)
 
 install_static_implib_a:

dlls/Makeimplib.rules.in

@@ -8,6 +8,7 @@
 
 DLLFLAGS = @DLLFLAGS@
 DEFS     = -D__WINESRC__ $(EXTRADEFS)
+INSTALLDIRS = $(DESTDIR)$(dlldir)
 
 @MAKE_RULES@
 
@@ -22,8 +23,7 @@ $(MODULE): $(OBJS) Makefile.in
 
 # Rules for installation
 
-install install-dev:: $(MODULE)
+install install-dev:: $(MODULE) $(DESTDIR)$(dlldir)
-	$(MKINSTALLDIRS) $(DESTDIR)$(dlldir)
 	$(INSTALL_DATA) $(MODULE) $(DESTDIR)$(dlldir)/$(MODULE)
 
 install-lib::

dlls/wineps.drv/Makefile.in

@@ -82,8 +82,7 @@ EXTRASUBDIRS = data
 
 @MAKE_DLL_RULES@
 
-install install-lib::
+install install-lib:: $(DESTDIR)$(datadir)/wine
-	$(MKINSTALLDIRS) $(DESTDIR)$(datadir)/wine
 	$(INSTALL_DATA) $(SRCDIR)/generic.ppd $(DESTDIR)$(datadir)/wine/generic.ppd
 
 uninstall::

documentation/Makefile.in

@@ -4,6 +4,8 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = none
 
+INSTALLDIRS = $(DESTDIR)$(mandir)/man$(api_manext)
+
 @MAKE_RULES@
 
 manpages:
@@ -20,8 +22,7 @@ sgmlpages:
 
 .PHONY: manpages htmlpages sgmlpages
 
-install:: manpages
+install:: manpages $(INSTALLDIRS)
-	$(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(api_manext)
 	for i in man$(api_manext)/*.$(api_manext); do $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/$$i; done
 
 clean::

fonts/Makefile.in

@@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = none
 fontdir   = $(datadir)/wine/fonts
+INSTALLDIRS = $(DESTDIR)$(fontdir)
 
 BITMAP_FONTS  = \
 	coue1255.fon \
@@ -354,8 +355,7 @@ hvgasys.fon: system-949-96-16.fnt $(FNT2FON)
 cvgasys.fon: system-950-96-16.fnt system-1252-96-16.fnt $(FNT2FON)
 	$(FNT2FON) system-950-96-16.fnt system-1252-96-16.fnt $@
 
-install:: $(FONTS)
+install:: $(FONTS) $(INSTALLDIRS)
-	$(MKINSTALLDIRS) $(DESTDIR)$(fontdir)
 	for i in $(FONTS); do $(INSTALL_DATA) $$i $(DESTDIR)$(fontdir)/$$i || exit 1; done
 
 uninstall::

include/Makefile.in

@@ -378,6 +378,13 @@ IDL_SRCS = $(WINDOWS_IDL_SRCS) $(WINE_IDL_SRCS:%=wine/%)
 
 EXTRASUBDIRS = ddk msvcrt msvcrt/sys wine
 
+INSTALLDIRS = \
+	$(DESTDIR)$(includedir)/windows/ddk \
+	$(DESTDIR)$(includedir)/windows \
+	$(DESTDIR)$(includedir)/msvcrt/sys \
+	$(DESTDIR)$(includedir)/msvcrt \
+	$(DESTDIR)$(includedir)
+
 @MAKE_RULES@
 
 WINDOWS_IDL_HEADERS = $(WINDOWS_IDL_SRCS:.idl=.h)
@@ -387,8 +394,7 @@ IDL_TLBS = $(IDL_TLB_SRCS:.idl=.tlb)
 
 all: $(IDL_HEADERS) $(IDL_TLBS)
 
-install:: $(IDL_HEADERS) $(IDL_TLBS)
+install:: $(IDL_HEADERS) $(IDL_TLBS) $(INSTALLDIRS)
-	$(MKINSTALLDIRS) $(DESTDIR)$(includedir) $(DESTDIR)$(includedir)/windows $(DESTDIR)$(includedir)/windows/ddk $(DESTDIR)$(includedir)/msvcrt $(DESTDIR)$(includedir)/msvcrt/sys
 	for f in $(WINDOWS_INCLUDES); do $(INSTALL_DATA) $(SRCDIR)/$$f $(DESTDIR)$(includedir)/windows/$$f; done
 	for f in $(WINDOWS_IDL_HEADERS) $(IDL_TLBS); do $(INSTALL_DATA) $$f $(DESTDIR)$(includedir)/windows/$$f; done
 	for f in $(MSVCRT_INCLUDES); do $(INSTALL_DATA) $(SRCDIR)/$$f $(DESTDIR)$(includedir)/$$f; done
@@ -400,6 +406,6 @@ install:: $(IDL_HEADERS) $(IDL_TLBS)
 uninstall::
 	-cd $(DESTDIR)$(includedir)/windows && $(RM) $(WINDOWS_INCLUDES) $(WINDOWS_IDL_HEADERS) $(IDL_TLBS)
 	-cd $(DESTDIR)$(includedir) && $(RM) $(MSVCRT_INCLUDES) $(WINE_INCLUDES) $(WINE_IDL_HEADERS)
-	-rmdir $(DESTDIR)$(includedir)/msvcrt/sys $(DESTDIR)$(includedir)/msvcrt $(DESTDIR)$(includedir)/windows/ddk $(DESTDIR)$(includedir)/windows $(DESTDIR)$(includedir)
+	-rmdir $(INSTALLDIRS)
 
 ### Dependencies:

libs/wine/Makefile.in

@@ -14,6 +14,8 @@ SOVERSION = 1
 SONAME    = libwine.so.$(SOVERSION)
 DYNAME    = libwine.$(SOVERSION).dylib
 
+INSTALLDIRS = $(DESTDIR)$(libdir)
+
 C_SRCS = \
 	casemap.c \
 	collation.c \
@@ -142,30 +144,24 @@ libwine.dylib: libwine.$(SOVERSION).dylib
 
 .PHONY: install-lib-so install-lib-dll install-lib-dylib install-dev-so install-dev-dll install-dev-dylib
 
-install-lib-so: libwine.so.$(VERSION) dummy
+install-lib-so: libwine.so.$(VERSION) $(DESTDIR)$(libdir) dummy
-	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
 	$(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-lib-dll: libwine.dll dummy
+install-lib-dll: libwine.dll $(DESTDIR)$(libdir) dummy
-	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
 	$(INSTALL_DATA) libwine.dll $(DESTDIR)$(libdir)/libwine.dll
 
-install-lib-dylib: libwine.$(VERSION).dylib dummy
+install-lib-dylib: libwine.$(VERSION).dylib $(DESTDIR)$(libdir) dummy
-	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
 	$(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-dev-so: dummy
+install-dev-so: $(DESTDIR)$(libdir) dummy
-	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
 	cd $(DESTDIR)$(libdir) && $(RM) libwine.so && $(LN_S) libwine.so.$(VERSION) libwine.so
 
-install-dev-dll: libwine.a dummy
+install-dev-dll: libwine.a $(DESTDIR)$(libdir) dummy
-	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
 	$(INSTALL_DATA) libwine.a $(DESTDIR)$(libdir)/libwine.a
 
-install-dev-dylib: dummy
+install-dev-dylib: $(DESTDIR)$(libdir) dummy
-	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
 	cd $(DESTDIR)$(libdir) && $(RM) libwine.dylib && $(LN_S) libwine.$(VERSION).dylib libwine.dylib
 
 install install-lib:: $(LIBEXT:%=install-lib-%)

loader/Makefile.in

@@ -20,6 +20,8 @@ WINE_BINARIES  = $(MAIN_BINARY) $(EXTRA_BINARIES)
 
 MANPAGES = wine.man
 
+INSTALLDIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man$(prog_manext)
+
 all: $(WINE_BINARIES) $(MODULE) $(MANPAGES)
 
 @MAKE_RULES@
@@ -43,8 +45,7 @@ wine-pthread: $(PTHREAD_OBJS) Makefile.in
 $(MODULE): $(MAIN_BINARY)
 	$(RM) $(MODULE) && $(LN_S) $(MAIN_BINARY) $(MODULE)
 
-install:: $(WINE_BINARIES) $(MANPAGES)
+install:: $(WINE_BINARIES) $(MANPAGES) $(INSTALLDIRS)
-	$(MKINSTALLDIRS) $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man$(prog_manext)
 	for f in $(WINE_BINARIES); do \
 	  if [ "$(MAIN_BINARY)" = "$$f" ]; \
 	  then $(INSTALL_PROGRAM) $$f $(DESTDIR)$(bindir)/$(MODULE); \

programs/Makefile.in

@@ -98,6 +98,8 @@ INSTALLPROGS = \
 	winepath \
 	winhelp
 
+INSTALLDIRS = $(DESTDIR)$(bindir)
+
 @MAKE_RULES@
 
 all: wineapploader winelauncher $(SUBDIRS)
@@ -112,8 +114,7 @@ winelauncher: winelauncher.in
 
 .PHONY: install-apploader install-progs install-progs.so $(INSTALLPROGS:%=%/__installprog__)
 
-install-apploader: wineapploader dummy
+install-apploader: wineapploader $(INSTALLDIRS) dummy
-	$(MKINSTALLDIRS) $(DESTDIR)$(bindir)
 	$(INSTALL_SCRIPT) wineapploader $(DESTDIR)$(bindir)/wineapploader
 
 $(INSTALLPROGS:%=%/__installprog__): install-apploader
@@ -124,8 +125,7 @@ install-progs.so: $(INSTALLPROGS:%=%/__installprog__)
 
 install-progs: # nothing to do here
 
-install:: winelauncher install-progs$(DLLEXT)
+install:: winelauncher install-progs$(DLLEXT) $(INSTALLDIRS)
-	$(MKINSTALLDIRS) $(DESTDIR)$(bindir)
 	$(INSTALL_SCRIPT) winelauncher $(DESTDIR)$(bindir)/winelauncher
 
 uninstall::

programs/Makeprog.rules.in

@@ -16,6 +16,7 @@ ALL_IMPORTS = $(DELAYIMPORTS) $(IMPORTS)
 ALL_LIBS    = $(ALL_IMPORTS:%=-l%) $(EXTRALIBS) $(LIBPORT) $(LDFLAGS) $(LIBS)
 BASEMODULE  = $(MODULE:.exe=)
 RUNTESTFLAGS= -q -P wine -T $(TOPOBJDIR)
+INSTALLDIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(dlldir) $(DESTDIR)$(mandir)/man$(prog_manext)
 
 @MAKE_RULES@
 
@@ -44,12 +45,10 @@ $(TESTRESULTS): $(MODULE)$(DLLEXT)
 
 .PHONY: install_prog install_prog.so uninstall_prog uninstall_prog.so
 
-install_prog.so: $(MODULE).so dummy
+install_prog.so: $(MODULE).so $(DESTDIR)$(dlldir) dummy
-	$(MKINSTALLDIRS) $(DESTDIR)$(dlldir)
 	$(INSTALL_PROGRAM) $(MODULE).so $(DESTDIR)$(dlldir)/$(MODULE).so
 
-install_prog: $(MODULE) dummy
+install_prog: $(MODULE) $(DESTDIR)$(bindir) dummy
-	$(MKINSTALLDIRS) $(DESTDIR)$(bindir)
 	$(INSTALL_PROGRAM) $(MODULE) $(DESTDIR)$(bindir)/$(MODULE)
 
 uninstall_prog.so: dummy

programs/winedbg/Makefile.in

@@ -48,8 +48,7 @@ dbg.tab.o: dbg.tab.h
 
 @LEX_OUTPUT_ROOT@.o: dbg.tab.h
 
-install:: $(MANPAGES)
+install:: $(MANPAGES) $(DESTDIR)$(mandir)/man$(prog_manext)
-	$(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(prog_manext)
 	$(INSTALL_DATA) winedbg.man $(DESTDIR)$(mandir)/man$(prog_manext)/winedbg.$(prog_manext)
 
 uninstall::

programs/winemenubuilder/Makefile.in

@@ -12,8 +12,7 @@ C_SRCS = \
 
 @MAKE_PROG_RULES@
 
-install::
+install:: $(DESTDIR)$(bindir)
-	$(MKINSTALLDIRS) $(DESTDIR)$(bindir)
 	$(INSTALL_SCRIPT) $(TOPSRCDIR)/tools/wineshelllink $(DESTDIR)$(bindir)/wineshelllink
 
 uninstall::

server/Makefile.in

@@ -53,6 +53,8 @@ C_SRCS = \
 PROGRAMS = wineserver
 MANPAGES = wineserver.man
 
+INSTALLDIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man$(prog_manext)
+
 all: $(PROGRAMS) $(MANPAGES)
 
 @MAKE_RULES@
@@ -62,8 +64,7 @@ LDEXERPATH = @LDEXERPATH@
 wineserver: $(OBJS)
 	$(CC) -o $@ $(LDEXERPATH) $(OBJS) $(LIBWINE) $(LIBPORT) $(LDFLAGS) $(LIBS)
 
-install:: $(PROGRAMS) $(MANPAGES)
+install:: $(PROGRAMS) $(MANPAGES) $(INSTALLDIRS)
-	$(MKINSTALLDIRS) $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man$(prog_manext)
 	$(INSTALL_PROGRAM) wineserver $(DESTDIR)$(bindir)/wineserver
 	$(INSTALL_DATA) wineserver.man $(DESTDIR)$(mandir)/man$(prog_manext)/wineserver.$(prog_manext)
 

tools/Makefile.in

@@ -42,6 +42,12 @@ SUBDIRS = \
 	$(INSTALLSUBDIRS) \
 	winapi
 
+INSTALLDIRS = \
+	$(DESTDIR)$(bindir) \
+	$(DESTDIR)$(datadir)/applications \
+	$(DESTDIR)$(datadir)/wine \
+	$(DESTDIR)$(mandir)/man$(prog_manext)
+
 UPDATE_DESKTOP_DATABASE = update-desktop-database
 
 all: $(PROGRAMS) $(MANPAGES) $(SUBDIRS)
@@ -73,15 +79,13 @@ wineprefixcreate: wineprefixcreate.in relpath$(EXEEXT)
 	sed -e "s,@bintodlldir\@,`$(RELPATH) $(bindir) $(dlldir)`,g" -e "s,@bintodatadir\@,`$(RELPATH) $(bindir) $(datadir)/wine`,g" $(SRCDIR)/wineprefixcreate.in >$@ || ($(RM) $@ && false)
 	chmod +x wineprefixcreate
 
-install install-lib:: wineprefixcreate
+install install-lib:: wineprefixcreate $(DESTDIR)$(bindir) $(DESTDIR)$(datadir)/wine $(DESTDIR)$(datadir)/applications
-	$(MKINSTALLDIRS) $(DESTDIR)$(bindir) $(DESTDIR)$(datadir)/wine $(DESTDIR)$(datadir)/applications
 	$(INSTALL_SCRIPT) wineprefixcreate $(DESTDIR)$(bindir)/wineprefixcreate
 	$(INSTALL_DATA) $(SRCDIR)/wine.inf $(DESTDIR)$(datadir)/wine/wine.inf
 	$(INSTALL_DATA) $(SRCDIR)/wine.desktop $(DESTDIR)$(datadir)/applications/wine.desktop
 	-$(UPDATE_DESKTOP_DATABASE)
 
-install install-dev:: $(INSTALLSUBDIRS:%=%/__install__) $(MANPAGES)
+install install-dev:: $(INSTALLSUBDIRS:%=%/__install__) $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man$(prog_manext)
-	$(MKINSTALLDIRS) $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man$(prog_manext)
 	$(INSTALL_SCRIPT) $(SRCDIR)/winemaker $(DESTDIR)$(bindir)/winemaker
 	$(INSTALL_DATA) winemaker.man $(DESTDIR)$(mandir)/man$(prog_manext)/winemaker.$(prog_manext)
 

tools/widl/Makefile.in

@@ -23,6 +23,8 @@ C_SRCS = \
 EXTRA_SRCS = parser.y parser.l
 EXTRA_OBJS = parser.tab.o @LEX_OUTPUT_ROOT@.o
 
+INSTALLDIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man$(prog_manext)
+
 all: $(PROGRAMS) $(MANPAGES)
 
 @MAKE_RULES@
@@ -42,8 +44,7 @@ parser.tab.o: parser.tab.h
 
 @LEX_OUTPUT_ROOT@.o: parser.tab.h
 
-install:: $(PROGRAMS) $(MANPAGES)
+install:: $(PROGRAMS) $(MANPAGES) $(INSTALLDIRS)
-	$(MKINSTALLDIRS) $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man$(prog_manext)
 	$(INSTALL_PROGRAM) widl$(EXEEXT) $(DESTDIR)$(bindir)/widl$(EXEEXT)
 	$(INSTALL_DATA) widl.man $(DESTDIR)$(mandir)/man$(prog_manext)/widl.$(prog_manext)
 

tools/winapi/Makefile.in

@@ -4,10 +4,11 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = none
 
+INSTALLDIRS = $(DESTDIR)$(bindir)
+
 @MAKE_RULES@
 
-install::
+install:: $(INSTALLDIRS)
-	$(MKINSTALLDIRS) $(DESTDIR)$(bindir)
 	$(INSTALL_SCRIPT) $(SRCDIR)/trampoline $(DESTDIR)$(bindir)/make_filter
 	$(INSTALL_SCRIPT) $(SRCDIR)/trampoline $(DESTDIR)$(bindir)/winapi_check
 	$(INSTALL_SCRIPT) $(SRCDIR)/trampoline $(DESTDIR)$(bindir)/winapi_cleanup

tools/winebuild/Makefile.in

@@ -19,6 +19,8 @@ C_SRCS = \
 	spec32.c \
 	utils.c
 
+INSTALLDIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man$(prog_manext)
+
 all: $(PROGRAMS) $(MANPAGES)
 
 @MAKE_RULES@
@@ -26,8 +28,7 @@ all: $(PROGRAMS) $(MANPAGES)
 winebuild$(EXEEXT): $(OBJS)
 	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBPORT) $(LDFLAGS)
 
-install:: $(PROGRAMS) $(MANPAGES)
+install:: $(PROGRAMS) $(MANPAGES) $(INSTALLDIRS)
-	$(MKINSTALLDIRS) $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man$(prog_manext)
 	$(INSTALL_PROGRAM) winebuild$(EXEEXT) $(DESTDIR)$(bindir)/winebuild$(EXEEXT)
 	$(INSTALL_DATA) winebuild.man $(DESTDIR)$(mandir)/man$(prog_manext)/winebuild.$(prog_manext)
 

tools/winedump/Makefile.in

@@ -24,6 +24,8 @@ C_SRCS = \
 	search.c \
 	symbol.c
 
+INSTALLDIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man$(prog_manext)
+
 all: $(PROGRAMS) $(MANPAGES)
 
 @MAKE_RULES@
@@ -31,8 +33,7 @@ all: $(PROGRAMS) $(MANPAGES)
 winedump$(EXEEXT): $(OBJS)
 	$(CC) $(CFLAGS) -o winedump$(EXEEXT) $(OBJS) $(LIBPORT) $(LDFLAGS)
 
-install:: $(PROGRAMS) $(MANPAGES)
+install:: $(PROGRAMS) $(MANPAGES) $(INSTALLDIRS)
-	$(MKINSTALLDIRS) $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man$(prog_manext)
 	$(INSTALL_PROGRAM) winedump$(EXEEXT) $(DESTDIR)$(bindir)/winedump$(EXEEXT)
 	$(INSTALL_DATA) winedump.man $(DESTDIR)$(mandir)/man$(prog_manext)/winedump.$(prog_manext)
 	$(INSTALL_SCRIPT) $(SRCDIR)/function_grep.pl $(DESTDIR)$(bindir)/function_grep.pl

tools/winegcc/Makefile.in

@@ -29,6 +29,8 @@ C_SRCS = \
 	utils.c \
 	winegcc.c
 
+INSTALLDIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man$(prog_manext)
+
 all: $(PROGRAMS) $(MANPAGES)
 
 @MAKE_RULES@
@@ -39,8 +41,7 @@ winegcc$(EXEEXT): winegcc.o utils.o
 winecpp$(EXEEXT) wineg++$(EXEEXT): winegcc$(EXEEXT)
 	$(RM) $@ && $(LN_S) winegcc$(EXEEXT) $@
 
-install:: $(PROGRAMS) $(MANPAGES)
+install:: $(PROGRAMS) $(MANPAGES) $(INSTALLDIRS)
-	$(MKINSTALLDIRS) $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man$(prog_manext)
 	$(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)

tools/wmc/Makefile.in

@@ -18,6 +18,8 @@ C_SRCS = \
 EXTRA_SRCS = mcy.y
 EXTRA_OBJS = mcy.tab.o
 
+INSTALLDIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man$(prog_manext)
+
 all: $(PROGRAMS) $(MANPAGES)
 
 mcl.o: mcy.tab.h
@@ -34,8 +36,7 @@ mcy.tab.c mcy.tab.h: mcy.y
 mcy.tab.h: mcy.tab.c
 mcy.tab.o: mcy.tab.h
 
-install:: $(PROGRAMS) $(MANPAGES)
+install:: $(PROGRAMS) $(MANPAGES) $(INSTALLDIRS)
-	$(MKINSTALLDIRS) $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man$(prog_manext)
 	$(INSTALL_DATA) wmc.man $(DESTDIR)$(mandir)/man$(prog_manext)/wmc.$(prog_manext)
 	$(INSTALL_PROGRAM) wmc$(EXEEXT) $(DESTDIR)$(bindir)/wmc$(EXEEXT)
 

tools/wrc/Makefile.in

@@ -22,6 +22,8 @@ C_SRCS = \
 EXTRA_SRCS = parser.y parser.l
 EXTRA_OBJS = parser.tab.o @LEX_OUTPUT_ROOT@.o
 
+INSTALLDIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man$(prog_manext)
+
 all: $(PROGRAMS) $(MANPAGES)
 
 @MAKE_RULES@
@@ -41,8 +43,7 @@ parser.tab.o: parser.tab.h
 
 @LEX_OUTPUT_ROOT@.o: parser.tab.h
 
-install:: $(PROGRAMS) $(MANPAGES)
+install:: $(PROGRAMS) $(MANPAGES) $(INSTALLDIRS)
-	$(MKINSTALLDIRS) $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man$(prog_manext)
 	$(INSTALL_DATA) wrc.man $(DESTDIR)$(mandir)/man$(prog_manext)/wrc.$(prog_manext)
 	$(INSTALL_PROGRAM) wrc$(EXEEXT) $(DESTDIR)$(bindir)/wrc$(EXEEXT)