Add support for 'make install DESTDIR'.

Makefile.in

@@ -76,8 +76,8 @@ wine: $(WINEWRAPPER)
 # Installation rules
 
 install-aclocal: dummy
-	$(MKINSTALLDIRS) $(datadir)/aclocal
-	$(INSTALL_DATA) $(SRCDIR)/aclocal.m4 $(datadir)/aclocal/wine.m4
+	$(MKINSTALLDIRS) $(DESTDIR)$(datadir)/aclocal
+	$(INSTALL_DATA) $(SRCDIR)/aclocal.m4 $(DESTDIR)$(datadir)/aclocal/wine.m4
 
 install-lib:: $(INSTALLLIBSUBDIRS:%=%/__install__) $(INSTALLBOTHSUBDIRS:%=%/__install-lib__)
 
@@ -86,8 +86,8 @@ install-dev:: $(INSTALLDEVSUBDIRS:%=%/__install__) $(INSTALLBOTHSUBDIRS:%=%/__in
 install:: install-lib install-dev install-aclocal
 
 uninstall:: $(INSTALLBOTHSUBDIRS:%=%/__uninstall__)
-	$(RM) $(datadir)/aclocal/wine.m4
-	-rmdir $(datadir)/wine $(datadir)/aclocal
+	$(RM) $(DESTDIR)$(datadir)/aclocal/wine.m4
+	-rmdir $(DESTDIR)$(datadir)/wine $(DESTDIR)$(datadir)/aclocal
 
 .PHONY: install-aclocal
 

dlls/Makedll.rules.in

@@ -109,19 +109,19 @@ WIN16_INSTALL = $(ALL_SPECS16:%=_install_/%)
 .PHONY: $(ALL_SPECS16:%=_install_/%) $(IMPORTLIB:%=_install_/%) $(IMPLIB_OBJS:%=_install_static_implib_/%)
 
 $(ALL_SPECS16:%=_install_/%): install_lib
-	cd $(dlldir) && $(RM) `basename $@`$(DLLEXT) && $(LN_S) $(MODULE)$(DLLEXT) `basename $@`$(DLLEXT)
+	cd $(DESTDIR)$(dlldir) && $(RM) `basename $@`$(DLLEXT) && $(LN_S) $(MODULE)$(DLLEXT) `basename $@`$(DLLEXT)
 
 install_lib: $(MODULE)$(DLLEXT)
-	$(MKINSTALLDIRS) $(dlldir)
-	$(INSTALL_PROGRAM) $(MODULE)$(DLLEXT) $(dlldir)/$(MODULE)$(DLLEXT)
+	$(MKINSTALLDIRS) $(DESTDIR)$(dlldir)
+	$(INSTALL_PROGRAM) $(MODULE)$(DLLEXT) $(DESTDIR)$(dlldir)/$(MODULE)$(DLLEXT)
 
 $(IMPORTLIB:%=_install_/%): $(IMPORTLIB)
-	$(MKINSTALLDIRS) $(dlldir)
-	$(INSTALL_DATA) $(IMPORTLIB) $(dlldir)/$(IMPORTLIB)
+	$(MKINSTALLDIRS) $(DESTDIR)$(dlldir)
+	$(INSTALL_DATA) $(IMPORTLIB) $(DESTDIR)$(dlldir)/$(IMPORTLIB)
 
 install_static_implib_def: $(STATICIMPLIB)
-	$(MKINSTALLDIRS) $(dlldir)
-	$(INSTALL_DATA) $(STATICIMPLIB) $(dlldir)/$(STATICIMPLIB)
+	$(MKINSTALLDIRS) $(DESTDIR)$(dlldir)
+	$(INSTALL_DATA) $(STATICIMPLIB) $(DESTDIR)$(dlldir)/$(STATICIMPLIB)
 
 install_static_implib_a:
 
@@ -132,7 +132,7 @@ install install-lib:: install_lib @WIN16_INSTALL@
 install install-dev:: $(IMPORTLIB:%=_install_/%) $(IMPLIB_OBJS:%=_install_static_implib_/%)
 
 uninstall::
-	[ ! -d $(dlldir) ] || (cd $(dlldir) && $(RM) $(MODULE)$(DLLEXT) $(IMPORTLIB) $(STATICIMPLIB) $(ALL_SPECS16:%=%$(DLLEXT)))
+	-cd $(DESTDIR)$(dlldir) && $(RM) $(MODULE)$(DLLEXT) $(IMPORTLIB) $(STATICIMPLIB) $(ALL_SPECS16:%=%$(DLLEXT))
 
 # Misc. rules
 

dlls/Makefile.in

@@ -1771,7 +1771,7 @@ install-lib:: $(INSTALLSUBDIRS:%=%/__install-lib__)
 install-dev:: $(INSTALLSUBDIRS:%=%/__install-dev__)
 
 uninstall::
-	-rmdir $(dlldir)
+	-rmdir $(DESTDIR)$(dlldir)
 
 clean::
 	$(RM) $(IMPORT_SYMLINKS)

dlls/Makeimplib.rules.in

@@ -24,11 +24,11 @@ $(MODULE): $(OBJS) Makefile.in
 # Rules for installation
 
 install install-dev:: $(MODULE)
-	$(MKINSTALLDIRS) $(dlldir)
-	$(INSTALL_DATA) $(MODULE) $(dlldir)/$(MODULE)
+	$(MKINSTALLDIRS) $(DESTDIR)$(dlldir)
+	$(INSTALL_DATA) $(MODULE) $(DESTDIR)$(dlldir)/$(MODULE)
 
 uninstall::
-	[ ! -d $(dlldir) ] || (cd $(dlldir) && $(RM) $(MODULE))
+	$(RM) $(DESTDIR)$(dlldir)/$(MODULE)
 
 # Misc. rules
 

dlls/make_dlls

@@ -348,7 +348,7 @@ install-lib:: \$(INSTALLSUBDIRS:%=%/__install-lib__)
 install-dev:: \$(INSTALLSUBDIRS:%=%/__install-dev__)
 
 uninstall::
-	-rmdir \$(dlldir)
+	-rmdir \$(DESTDIR)\$(dlldir)
 
 clean::
 	\$(RM) \$(IMPORT_SYMLINKS)

dlls/wineps/Makefile.in

@@ -83,10 +83,10 @@ EXTRASUBDIRS = data
 @MAKE_DLL_RULES@
 
 install install-lib::
-	$(MKINSTALLDIRS) $(datadir)/wine
-	$(INSTALL_DATA) $(SRCDIR)/generic.ppd $(datadir)/wine/generic.ppd
+	$(MKINSTALLDIRS) $(DESTDIR)$(datadir)/wine
+	$(INSTALL_DATA) $(SRCDIR)/generic.ppd $(DESTDIR)$(datadir)/wine/generic.ppd
 
 uninstall::
-	$(RM) $(datadir)/wine/generic.ppd
+	$(RM) $(DESTDIR)$(datadir)/wine/generic.ppd
 
 ### Dependencies:

documentation/Makefile.in

@@ -21,8 +21,8 @@ sgmlpages:
 .PHONY: manpages htmlpages sgmlpages
 
 install:: manpages
-	$(MKINSTALLDIRS) $(mandir)/man$(api_manext)
-	for i in man$(api_manext)/*.$(api_manext); do $(INSTALL_DATA) $$i $(mandir)/$$i; done
+	$(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(api_manext)
+	for i in man$(api_manext)/*.$(api_manext); do $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/$$i; done
 
 clean::
 	$(RM) -r html api-guide man$(api_manext)

fonts/Makefile.in

@@ -289,12 +289,12 @@ 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)
-	$(MKINSTALLDIRS) $(fontdir)
-	for i in $(FONTS); do $(INSTALL_DATA) $$i $(fontdir)/$$i || exit 1; done
+	$(MKINSTALLDIRS) $(DESTDIR)$(fontdir)
+	for i in $(FONTS); do $(INSTALL_DATA) $$i $(DESTDIR)$(fontdir)/$$i || exit 1; done
 
 uninstall::
-	-cd $(fontdir) && $(RM) $(FONTS)
-	-rmdir $(fontdir)
+	-cd $(DESTDIR)$(fontdir) && $(RM) $(FONTS)
+	-rmdir $(DESTDIR)$(fontdir)
 
 clean::
 	$(RM) *.fon *.fnt *.ttf

include/Makefile.in

@@ -350,7 +350,7 @@ WINE_INCLUDES = \
 
 IDL_SRCS = $(WINDOWS_IDL_SRCS) $(WINE_IDL_SRCS:%=wine/%)
 
-EXTRASUBDIRS = msvcrt msvcrt/sys wine
+EXTRASUBDIRS = ddk msvcrt msvcrt/sys wine
 
 @MAKE_RULES@
 
@@ -361,18 +361,18 @@ IDL_HEADERS = $(IDL_SRCS:.idl=.h)
 all: $(IDL_HEADERS)
 
 install:: $(IDL_HEADERS)
-	$(MKINSTALLDIRS) $(includedir) $(includedir)/windows $(includedir)/windows/ddk $(includedir)/msvcrt $(includedir)/msvcrt/sys
-	for f in $(WINDOWS_INCLUDES); do $(INSTALL_DATA) $(SRCDIR)/$$f $(includedir)/windows/$$f; done
-	for f in $(WINDOWS_IDL_HEADERS); do $(INSTALL_DATA) $$f $(includedir)/windows/$$f; done
-	for f in $(MSVCRT_INCLUDES); do $(INSTALL_DATA) $(SRCDIR)/$$f $(includedir)/$$f; done
-	for f in $(WINE_INCLUDES); do $(INSTALL_DATA) $(SRCDIR)/wine/$$f $(includedir)/$$f; done
-	for f in $(WINE_IDL_HEADERS); do $(INSTALL_DATA) wine/$$f $(includedir)/$$f; done
+	$(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); do $(INSTALL_DATA) $$f $(DESTDIR)$(includedir)/windows/$$f; done
+	for f in $(MSVCRT_INCLUDES); do $(INSTALL_DATA) $(SRCDIR)/$$f $(DESTDIR)$(includedir)/$$f; done
+	for f in $(WINE_INCLUDES); do $(INSTALL_DATA) $(SRCDIR)/wine/$$f $(DESTDIR)$(includedir)/$$f; done
+	for f in $(WINE_IDL_HEADERS); do $(INSTALL_DATA) wine/$$f $(DESTDIR)$(includedir)/$$f; done
 
 # Don't just do a rm -rf on $(includedir) -- don't want to wipe out
 # anything extra the user may have put there.
 uninstall::
-	[ -d $(includedir)/windows ] && cd $(includedir)/windows && $(RM) $(WINDOWS_INCLUDES) $(WINDOWS_IDL_HEADERS) || true
-	[ -d $(includedir) ] && cd $(includedir) && $(RM) $(MSVCRT_INCLUDES) $(WINE_INCLUDES) $(WINE_IDL_HEADERS) || true
-	-rmdir $(includedir)/msvcrt/sys $(includedir)/msvcrt $(includedir)/windows/ddk $(includedir)/windows $(includedir)
+	-cd $(DESTDIR)$(includedir)/windows && $(RM) $(WINDOWS_INCLUDES) $(WINDOWS_IDL_HEADERS)
+	-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)
 
 ### Dependencies:

libs/Makelib.rules.in

@@ -40,34 +40,34 @@ $(LIBNAME).dylib: $(LIBNAME).$(SOVERSION).dylib
 .PHONY: install-lib-so install-lib-dll install-lib-dylib install-dev-so install-dev-dll install-dev-dylib
 
 install-lib-so: $(LIBNAME).so.$(SOVERSION) dummy
-	$(MKINSTALLDIRS) $(libdir)
-	$(INSTALL_PROGRAM) $(LIBNAME).so.$(SOVERSION) $(libdir)/$(LIBNAME).so.$(SOVERSION)
+	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
+	$(INSTALL_PROGRAM) $(LIBNAME).so.$(SOVERSION) $(DESTDIR)$(libdir)/$(LIBNAME).so.$(SOVERSION)
 
 install-lib-dll: $(LIBNAME).dll dummy
-	$(MKINSTALLDIRS) $(libdir)
-	$(INSTALL_DATA) $(LIBNAME).dll $(libdir)/$(LIBNAME).dll
+	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
+	$(INSTALL_DATA) $(LIBNAME).dll $(DESTDIR)$(libdir)/$(LIBNAME).dll
 
 install-lib-dylib: $(LIBNAME).$(SOVERSION).dylib dummy
-	$(MKINSTALLDIRS) $(libdir)
-	$(INSTALL_PROGRAM) $(LIBNAME).$(SOVERSION).dylib $(libdir)/$(LIBNAME).$(SOVERSION).dylib
+	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
+	$(INSTALL_PROGRAM) $(LIBNAME).$(SOVERSION).dylib $(DESTDIR)$(libdir)/$(LIBNAME).$(SOVERSION).dylib
 
 install-dev-so: dummy
-	$(MKINSTALLDIRS) $(libdir)
-	cd $(libdir) && $(RM) $(LIBNAME).so && $(LN_S) $(LIBNAME).so.$(SOVERSION) $(LIBNAME).so
+	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
+	cd $(DESTDIR)$(libdir) && $(RM) $(LIBNAME).so && $(LN_S) $(LIBNAME).so.$(SOVERSION) $(LIBNAME).so
 
 install-dev-dll: $(LIBNAME).a dummy
-	$(MKINSTALLDIRS) $(libdir)
-	$(INSTALL_DATA) $(LIBNAME).a $(libdir)/$(LIBNAME).a
+	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
+	$(INSTALL_DATA) $(LIBNAME).a $(DESTDIR)$(libdir)/$(LIBNAME).a
 
 install-dev-dylib: dummy
-	$(MKINSTALLDIRS) $(libdir)
-	cd $(libdir) && $(RM) $(LIBNAME).dylib && $(LN_S) $(LIBNAME).$(SOVERSION).dylib $(LIBNAME).dylib
+	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
+	cd $(DESTDIR)$(libdir) && $(RM) $(LIBNAME).dylib && $(LN_S) $(LIBNAME).$(SOVERSION).dylib $(LIBNAME).dylib
 
 install install-lib:: $(LIBEXT:%=install-lib-%)
 install install-dev:: $(LIBEXT:%=install-dev-%)
 
 uninstall::
-	$(RM) $(libdir)/$(LIBNAME).a $(libdir)/$(LIBNAME).dll $(libdir)/$(LIBNAME).so $(libdir)/$(LIBNAME).so.$(SOVERSION) $(libdir)/$(LIBNAME).dylib $(libdir)/$(LIBNAME).$(SOVERSION).dylib
+	-cd $(DESTDIR)$(libdir) && $(RM) $(LIBNAME).a $(LIBNAME).dll $(LIBNAME).so $(LIBNAME).so.$(SOVERSION) $(LIBNAME).dylib $(LIBNAME).$(SOVERSION).dylib
 
 clean::
 	$(RM) $(LIBNAME).so.$(SOVERSION) $(LIBNAME).dll $(LIBNAME).$(SOVERSION).dylib

loader/Makefile.in

@@ -42,18 +42,18 @@ $(MODULE): $(MAIN_BINARY)
 	$(RM) $(MODULE) && $(LN_S) $(MAIN_BINARY) $(MODULE)
 
 install:: $(WINE_BINARIES) $(MANPAGES)
-	$(MKINSTALLDIRS) $(bindir) $(mandir)/man$(prog_manext)
+	$(MKINSTALLDIRS) $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man$(prog_manext)
 	for f in $(WINE_BINARIES); do \
 	  if [ "$(MAIN_BINARY)" = "$$f" ]; \
-	  then $(INSTALL_PROGRAM) $$f $(bindir)/$(MODULE); \
-	  else $(INSTALL_PROGRAM) $$f $(bindir)/$$f; \
+	  then $(INSTALL_PROGRAM) $$f $(DESTDIR)$(bindir)/$(MODULE); \
+	  else $(INSTALL_PROGRAM) $$f $(DESTDIR)$(bindir)/$$f; \
 	  fi; \
 	done
-	$(INSTALL_DATA) wine.man $(mandir)/man$(prog_manext)/wine.$(prog_manext)
+	$(INSTALL_DATA) wine.man $(DESTDIR)$(mandir)/man$(prog_manext)/wine.$(prog_manext)
 
 uninstall::
-	-cd $(bindir) && $(RM) $(WINE_BINARIES) $(MODULE)
-	$(RM) $(mandir)/man$(prog_manext)/wine.$(prog_manext)
+	-cd $(DESTDIR)$(bindir) && $(RM) $(WINE_BINARIES) $(MODULE)
+	$(RM) $(DESTDIR)$(mandir)/man$(prog_manext)/wine.$(prog_manext)
 
 clean::
 	$(RM) $(WINE_BINARIES) $(MODULE)

programs/Makefile.in

@@ -145,24 +145,24 @@ winelauncher: winelauncher.in
 .PHONY: install-apploader install-progs install-progs.so $(INSTALLPROGS:%=%/__installprog__)
 
 install-apploader: wineapploader dummy
-	$(MKINSTALLDIRS) $(bindir)
-	$(INSTALL_SCRIPT) wineapploader $(bindir)/wineapploader
+	$(MKINSTALLDIRS) $(DESTDIR)$(bindir)
+	$(INSTALL_SCRIPT) wineapploader $(DESTDIR)$(bindir)/wineapploader
 
 $(INSTALLPROGS:%=%/__installprog__): install-apploader
-	$(RM) $(bindir)/`dirname $@` && $(LN) $(bindir)/wineapploader $(bindir)/`dirname $@`
+	$(RM) $(DESTDIR)$(bindir)/`dirname $@` && $(LN) $(DESTDIR)$(bindir)/wineapploader $(DESTDIR)$(bindir)/`dirname $@`
 
 install-progs.so: $(INSTALLPROGS:%=%/__installprog__)
-	$(RM) $(bindir)/wineapploader
+	$(RM) $(DESTDIR)$(bindir)/wineapploader
 
 install-progs: # nothing to do here
 
 install:: winelauncher install-progs$(DLLEXT)
-	$(MKINSTALLDIRS) $(bindir)
-	$(INSTALL_SCRIPT) winelauncher $(bindir)/winelauncher
+	$(MKINSTALLDIRS) $(DESTDIR)$(bindir)
+	$(INSTALL_SCRIPT) winelauncher $(DESTDIR)$(bindir)/winelauncher
 
 uninstall::
-	-cd $(bindir) && $(RM) wineapploader winelauncher $(INSTALLPROGS)
-	-rmdir $(dlldir)
+	-cd $(DESTDIR)$(bindir) && $(RM) wineapploader winelauncher $(INSTALLPROGS)
+	-rmdir $(DESTDIR)$(dlldir)
 
 clean::
 	$(RM) wineapploader winelauncher $(SYMLINKS)

programs/Makeprog.rules.in

@@ -46,18 +46,18 @@ $(TESTRESULTS): $(MODULE)$(DLLEXT)
 .PHONY: install_prog install_prog.so uninstall_prog uninstall_prog.so
 
 install_prog.so: $(MODULE).so dummy
-	$(MKINSTALLDIRS) $(dlldir)
-	$(INSTALL_PROGRAM) $(MODULE).so $(dlldir)/$(MODULE).so
+	$(MKINSTALLDIRS) $(DESTDIR)$(dlldir)
+	$(INSTALL_PROGRAM) $(MODULE).so $(DESTDIR)$(dlldir)/$(MODULE).so
 
 install_prog: $(MODULE) dummy
-	$(MKINSTALLDIRS) $(bindir)
-	$(INSTALL_PROGRAM) $(MODULE) $(bindir)/$(MODULE)
+	$(MKINSTALLDIRS) $(DESTDIR)$(bindir)
+	$(INSTALL_PROGRAM) $(MODULE) $(DESTDIR)$(bindir)/$(MODULE)
 
 uninstall_prog.so: dummy
-	$(RM) $(dlldir)/$(MODULE).so
+	$(RM) $(DESTDIR)$(dlldir)/$(MODULE).so
 
 uninstall_prog: dummy
-	$(RM) $(bindir)/$(MODULE)
+	$(RM) $(DESTDIR)$(bindir)/$(MODULE)
 
 install:: install_prog$(DLLEXT)
 

programs/avitools/Makefile.in

@@ -44,22 +44,22 @@ $(PROGRAMS:.exe=): $(WINEWRAPPER)
 .PHONY: install_prog install_prog.so uninstall_prog uninstall_prog.so
 
 install_prog.so: $(PROGRAMS:%=%.so)
-	$(MKINSTALLDIRS) $(dlldir)
-	$(INSTALL_PROGRAM) aviinfo.exe.so $(dlldir)/aviinfo.exe.so
-	$(INSTALL_PROGRAM) aviplay.exe.so $(dlldir)/aviplay.exe.so
-	$(INSTALL_PROGRAM) icinfo.exe.so $(dlldir)/icinfo.exe.so
+	$(MKINSTALLDIRS) $(DESTDIR)$(dlldir)
+	$(INSTALL_PROGRAM) aviinfo.exe.so $(DESTDIR)$(dlldir)/aviinfo.exe.so
+	$(INSTALL_PROGRAM) aviplay.exe.so $(DESTDIR)$(dlldir)/aviplay.exe.so
+	$(INSTALL_PROGRAM) icinfo.exe.so $(DESTDIR)$(dlldir)/icinfo.exe.so
 
 install_prog: $(PROGRAMS)
-	$(MKINSTALLDIRS) $(bindir)
-	$(INSTALL_PROGRAM) aviinfo.exe $(bindir)/aviinfo.exe
-	$(INSTALL_PROGRAM) aviplay.exe $(bindir)/aviplay.exe
-	$(INSTALL_PROGRAM) icinfo.exe $(bindir)/icinfo.exe
+	$(MKINSTALLDIRS) $(DESTDIR)$(bindir)
+	$(INSTALL_PROGRAM) aviinfo.exe $(DESTDIR)$(bindir)/aviinfo.exe
+	$(INSTALL_PROGRAM) aviplay.exe $(DESTDIR)$(bindir)/aviplay.exe
+	$(INSTALL_PROGRAM) icinfo.exe $(DESTDIR)$(bindir)/icinfo.exe
 
 uninstall_prog.so:
-	$(RM) $(dlldir)/aviinfo.exe.so $(dlldir)/aviplay.exe.so $(dlldir)/icinfo.exe.so
+	$(RM) $(DESTDIR)$(dlldir)/aviinfo.exe.so $(DESTDIR)$(dlldir)/aviplay.exe.so $(DESTDIR)$(dlldir)/icinfo.exe.so
 
 uninstall_prog:
-	$(RM) $(bindir)/aviinfo.exe $(bindir)/aviplay.exe $(bindir)/icinfo.exe
+	$(RM) $(DESTDIR)$(bindir)/aviinfo.exe $(DESTDIR)$(bindir)/aviplay.exe $(DESTDIR)$(bindir)/icinfo.exe
 
 install:: install_prog$(DLLEXT)
 

programs/make_progs

@@ -160,24 +160,24 @@ winelauncher: winelauncher.in
 .PHONY: install-apploader install-progs install-progs.so \$(INSTALLPROGS:%=%/__installprog__)
 
 install-apploader: wineapploader dummy
-	\$(MKINSTALLDIRS) \$(bindir)
-	\$(INSTALL_SCRIPT) wineapploader \$(bindir)/wineapploader
+	\$(MKINSTALLDIRS) \$(DESTDIR)\$(bindir)
+	\$(INSTALL_SCRIPT) wineapploader \$(DESTDIR)\$(bindir)/wineapploader
 
 \$(INSTALLPROGS:%=%/__installprog__): install-apploader
-	\$(RM) \$(bindir)/`dirname \$\@` && \$(LN) \$(bindir)/wineapploader \$(bindir)/`dirname \$\@`
+	\$(RM) \$(DESTDIR)\$(bindir)/`dirname \$\@` && \$(LN) \$(DESTDIR)\$(bindir)/wineapploader \$(DESTDIR)\$(bindir)/`dirname \$\@`
 
 install-progs.so: \$(INSTALLPROGS:%=%/__installprog__)
-	\$(RM) \$(bindir)/wineapploader
+	\$(RM) \$(DESTDIR)\$(bindir)/wineapploader
 
 install-progs: # nothing to do here
 
 install:: winelauncher install-progs\$(DLLEXT)
-	\$(MKINSTALLDIRS) \$(bindir)
-	\$(INSTALL_SCRIPT) winelauncher \$(bindir)/winelauncher
+	\$(MKINSTALLDIRS) \$(DESTDIR)\$(bindir)
+	\$(INSTALL_SCRIPT) winelauncher \$(DESTDIR)\$(bindir)/winelauncher
 
 uninstall::
-	-cd \$(bindir) && \$(RM) wineapploader winelauncher \$(INSTALLPROGS)
-	-rmdir \$(dlldir)
+	-cd \$(DESTDIR)\$(bindir) && \$(RM) wineapploader winelauncher \$(INSTALLPROGS)
+	-rmdir \$(DESTDIR)\$(dlldir)
 
 clean::
 	\$(RM) wineapploader winelauncher \$(SYMLINKS)

programs/winedbg/Makefile.in

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

programs/winemenubuilder/Makefile.in

@@ -13,10 +13,10 @@ C_SRCS = \
 @MAKE_PROG_RULES@
 
 install::
-	$(MKINSTALLDIRS) $(bindir)
-	$(INSTALL_SCRIPT) $(TOPSRCDIR)/tools/wineshelllink $(bindir)/wineshelllink
+	$(MKINSTALLDIRS) $(DESTDIR)$(bindir)
+	$(INSTALL_SCRIPT) $(TOPSRCDIR)/tools/wineshelllink $(DESTDIR)$(bindir)/wineshelllink
 
 uninstall::
-	$(RM) $(bindir)/wineshelllink
+	$(RM) $(DESTDIR)$(bindir)/wineshelllink
 
 ### Dependencies:

server/Makefile.in

@@ -61,11 +61,11 @@ wineserver: $(OBJS)
 	$(CC) -o $(PROGRAMS) $(OBJS) $(LIBWINE) $(LIBUNICODE) $(LIBPORT) $(LDFLAGS) $(LIBS)
 
 install:: $(PROGRAMS) $(MANPAGES)
-	$(MKINSTALLDIRS) $(bindir) $(mandir)/man$(prog_manext)
-	$(INSTALL_PROGRAM) wineserver $(bindir)/wineserver
-	$(INSTALL_DATA) wineserver.man $(mandir)/man$(prog_manext)/wineserver.$(prog_manext)
+	$(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)
 
 uninstall::
-	$(RM) $(bindir)/wineserver $(mandir)/man$(prog_manext)/wineserver.$(prog_manext)
+	$(RM) $(DESTDIR)$(bindir)/wineserver $(DESTDIR)$(mandir)/man$(prog_manext)/wineserver.$(prog_manext)
 
 ### Dependencies:

tools/Makefile.in

@@ -69,20 +69,19 @@ wineprefixcreate: wineprefixcreate.in
 	chmod +x wineprefixcreate
 
 install install-lib:: wineprefixcreate
-	$(MKINSTALLDIRS) $(bindir) $(datadir)/wine $(datadir)/applications
-	$(INSTALL_SCRIPT) wineprefixcreate $(bindir)/wineprefixcreate
-	$(INSTALL_DATA) $(SRCDIR)/wine.inf $(datadir)/wine/wine.inf
-	$(INSTALL_DATA) $(SRCDIR)/wine.desktop $(datadir)/applications/wine.desktop
+	$(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)
-	$(MKINSTALLDIRS) $(bindir) $(mandir)/man$(prog_manext)
-	$(INSTALL_SCRIPT) $(SRCDIR)/winemaker $(bindir)/winemaker
-	$(INSTALL_DATA) winemaker.man $(mandir)/man$(prog_manext)/winemaker.$(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)
 
 uninstall::
-	$(RM) $(bindir)/winemaker $(bindir)/wineprefixcreate $(mandir)/man$(prog_manext)/winemaker.$(prog_manext) \
-	      $(datadir)/wine/wine.inf $(datadir)/applications/wine.desktop
+	$(RM) $(DESTDIR)$(bindir)/winemaker $(DESTDIR)$(bindir)/wineprefixcreate $(DESTDIR)$(mandir)/man$(prog_manext)/winemaker.$(prog_manext) $(DESTDIR)$(datadir)/wine/wine.inf $(DESTDIR)$(datadir)/applications/wine.desktop
 	-$(UPDATE_DESKTOP_DATABASE)
 
 ### Dependencies:

tools/widl/Makefile.in

@@ -43,11 +43,11 @@ parser.tab.o: parser.tab.h
 @LEX_OUTPUT_ROOT@.o: parser.tab.h
 
 install:: $(PROGRAMS) $(MANPAGES)
-	$(MKINSTALLDIRS) $(bindir) $(mandir)/man$(prog_manext)
-	$(INSTALL_PROGRAM) widl$(EXEEXT) $(bindir)/widl$(EXEEXT)
-	$(INSTALL_DATA) widl.man $(mandir)/man$(prog_manext)/widl.$(prog_manext)
+	$(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)
 
 uninstall::
-	$(RM) $(bindir)/widl$(EXEEXT) $(mandir)/man$(prog_manext)/widl.$(prog_manext)
+	$(RM) $(DESTDIR)$(bindir)/widl$(EXEEXT) $(DESTDIR)$(mandir)/man$(prog_manext)/widl.$(prog_manext)
 
 ### Dependencies:

tools/winapi/Makefile.in

@@ -7,19 +7,15 @@ MODULE    = none
 @MAKE_RULES@
 
 install::
-	$(MKINSTALLDIRS) $(bindir)
-	$(INSTALL_SCRIPT) $(SRCDIR)/trampoline $(bindir)/make_filter
-	$(INSTALL_SCRIPT) $(SRCDIR)/trampoline $(bindir)/winapi_check
-	$(INSTALL_SCRIPT) $(SRCDIR)/trampoline $(bindir)/winapi_cleanup
-	$(INSTALL_SCRIPT) $(SRCDIR)/trampoline $(bindir)/winapi_extract
-	$(INSTALL_SCRIPT) $(SRCDIR)/trampoline $(bindir)/winapi_fixup
-	$(INSTALL_SCRIPT) $(SRCDIR)/trampoline $(bindir)/winapi_test
+	$(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
+	$(INSTALL_SCRIPT) $(SRCDIR)/trampoline $(DESTDIR)$(bindir)/winapi_extract
+	$(INSTALL_SCRIPT) $(SRCDIR)/trampoline $(DESTDIR)$(bindir)/winapi_fixup
+	$(INSTALL_SCRIPT) $(SRCDIR)/trampoline $(DESTDIR)$(bindir)/winapi_test
 
 uninstall::
-	$(RM) $(bindir)/make_filter
-	$(RM) $(bindir)/winapi_check
-	$(RM) $(bindir)/winapi_extract
-	$(RM) $(bindir)/winapi_fixup
-	$(RM) $(bindir)/winapi_test
+	-cd $(DESTDIR)$(bindir) && $(RM) make_filter winapi_check winapi_extract winapi_fixup winapi_test
 
 ### Dependencies:

tools/winebuild/Makefile.in

@@ -27,11 +27,11 @@ winebuild$(EXEEXT): $(OBJS)
 	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBPORT) $(LDFLAGS)
 
 install:: $(PROGRAMS) $(MANPAGES)
-	$(MKINSTALLDIRS) $(bindir) $(mandir)/man$(prog_manext)
-	$(INSTALL_PROGRAM) winebuild$(EXEEXT) $(bindir)/winebuild$(EXEEXT)
-	$(INSTALL_DATA) winebuild.man $(mandir)/man$(prog_manext)/winebuild.$(prog_manext)
+	$(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)
 
 uninstall::
-	$(RM) $(bindir)/winebuild$(EXEEXT) $(mandir)/man$(prog_manext)/winebuild.$(prog_manext)
+	$(RM) $(DESTDIR)$(bindir)/winebuild$(EXEEXT) $(DESTDIR)$(mandir)/man$(prog_manext)/winebuild.$(prog_manext)
 
 ### Dependencies:

tools/winedump/Makefile.in

@@ -32,13 +32,12 @@ winedump$(EXEEXT): $(OBJS)
 	$(CC) $(CFLAGS) -o winedump$(EXEEXT) $(OBJS) $(LIBPORT) $(LDFLAGS)
 
 install:: $(PROGRAMS) $(MANPAGES)
-	$(MKINSTALLDIRS) $(bindir) $(mandir)/man$(prog_manext)
-	$(INSTALL_PROGRAM) winedump$(EXEEXT) $(bindir)/winedump$(EXEEXT)
-	$(INSTALL_DATA) winedump.man $(mandir)/man$(prog_manext)/winedump.$(prog_manext)
-	$(INSTALL_SCRIPT) $(SRCDIR)/function_grep.pl $(bindir)/function_grep.pl
+	$(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
 
 uninstall::
-	$(RM) $(bindir)/function_grep.pl $(bindir)/winedump$(EXEEXT)
-	$(RM) $(mandir)/man$(prog_manext)/winedump.$(prog_manext)
+	$(RM) $(DESTDIR)$(bindir)/function_grep.pl $(DESTDIR)$(bindir)/winedump$(EXEEXT) $(DESTDIR)$(mandir)/man$(prog_manext)/winedump.$(prog_manext)
 
 ### Dependencies:

tools/winegcc/Makefile.in

@@ -40,15 +40,15 @@ winecpp$(EXEEXT) wineg++$(EXEEXT): winegcc$(EXEEXT)
 	$(RM) $@ && $(LN_S) winegcc$(EXEEXT) $@
 
 install:: $(PROGRAMS) $(MANPAGES)
-	$(MKINSTALLDIRS) $(bindir) $(mandir)/man$(prog_manext)
-	$(INSTALL_PROGRAM) winegcc$(EXEEXT) $(bindir)/winegcc$(EXEEXT)
-	cd $(bindir) && $(RM) wineg++$(EXEEXT) && $(LN_S) winegcc$(EXEEXT) wineg++$(EXEEXT)
-	cd $(bindir) && $(RM) winecpp$(EXEEXT) && $(LN_S) winegcc$(EXEEXT) winecpp$(EXEEXT)
-	$(INSTALL_DATA) winegcc.man $(mandir)/man$(prog_manext)/winegcc.$(prog_manext)
-	cd $(mandir)/man$(prog_manext) && $(RM) wineg++.$(prog_manext) && $(LN_S) winegcc.$(prog_manext) wineg++.$(prog_manext)
+	$(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)
+	$(INSTALL_DATA) winegcc.man $(DESTDIR)$(mandir)/man$(prog_manext)/winegcc.$(prog_manext)
+	cd $(DESTDIR)$(mandir)/man$(prog_manext) && $(RM) wineg++.$(prog_manext) && $(LN_S) winegcc.$(prog_manext) wineg++.$(prog_manext)
 
 uninstall::
-	$(RM) $(bindir)/winegcc$(EXEEXT) $(bindir)/wineg++$(EXEEXT) $(bindir)/winecpp$(EXEEXT) \
-	      $(mandir)/man$(prog_manext)/winegcc.$(prog_manext) $(mandir)/man$(prog_manext)/wineg++.$(prog_manext)
+	$(RM) $(DESTDIR)$(bindir)/winegcc$(EXEEXT) $(DESTDIR)$(bindir)/wineg++$(EXEEXT) $(DESTDIR)$(bindir)/winecpp$(EXEEXT) \
+	      $(DESTDIR)$(mandir)/man$(prog_manext)/winegcc.$(prog_manext) $(DESTDIR)$(mandir)/man$(prog_manext)/wineg++.$(prog_manext)
 
 ### Dependencies:

tools/wmc/Makefile.in

@@ -35,11 +35,11 @@ mcy.tab.h: mcy.tab.c
 mcy.tab.o: mcy.tab.h
 
 install:: $(PROGRAMS) $(MANPAGES)
-	$(MKINSTALLDIRS) $(bindir) $(mandir)/man$(prog_manext)
-	$(INSTALL_DATA) wmc.man $(mandir)/man$(prog_manext)/wmc.$(prog_manext)
-	$(INSTALL_PROGRAM) wmc$(EXEEXT) $(bindir)/wmc$(EXEEXT)
+	$(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)
 
 uninstall::
-	$(RM) $(bindir)/wmc$(EXEEXT) $(mandir)/man$(prog_manext)/wmc.$(prog_manext)
+	$(RM) $(DESTDIR)$(bindir)/wmc$(EXEEXT) $(DESTDIR)$(mandir)/man$(prog_manext)/wmc.$(prog_manext)
 
 ### Dependencies:

tools/wrc/Makefile.in

@@ -42,11 +42,11 @@ parser.tab.o: parser.tab.h
 @LEX_OUTPUT_ROOT@.o: parser.tab.h
 
 install:: $(PROGRAMS) $(MANPAGES)
-	$(MKINSTALLDIRS) $(bindir) $(mandir)/man$(prog_manext)
-	$(INSTALL_DATA) wrc.man $(mandir)/man$(prog_manext)/wrc.$(prog_manext)
-	$(INSTALL_PROGRAM) wrc$(EXEEXT) $(bindir)/wrc$(EXEEXT)
+	$(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)
 
 uninstall::
-	$(RM) $(bindir)/wrc$(EXEEXT) $(mandir)/man$(prog_manext)/wrc.$(prog_manext)
+	$(RM) $(DESTDIR)$(bindir)/wrc$(EXEEXT) $(DESTDIR)$(mandir)/man$(prog_manext)/wrc.$(prog_manext)
 
 ### Dependencies: