From 08eea24b94dc8a238b0af295471f512719acfb55 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Sat, 5 Oct 2013 19:41:25 +0200
Subject: [PATCH] makefiles: Get rid of the recursive installation rules for
 dlls and programs.

---
 Make.rules.in              |  3 ---
 configure                  |  3 ---
 configure.ac               |  1 -
 dlls/Makedll.rules.in      | 19 -------------------
 programs/Makeprog.rules.in | 19 -------------------
 5 files changed, 45 deletions(-)

diff --git a/Make.rules.in b/Make.rules.in
index 2f3f29ab61f..aeb605bee86 100644
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -163,9 +163,6 @@ install-man-pages:: $(MANPAGE) $(DESTDIR)$(mandir)/man$(prog_manext)
 uninstall-man-pages::
 	$(RM) $(DESTDIR)$(mandir)/man$(prog_manext)/$(MANPAGE:.man=).$(prog_manext)
 
-install:: @WOW64_DISABLE@ $(MANPAGE:.man=.man.in install-man-pages)
-uninstall:: @WOW64_DISABLE@ $(MANPAGE:.man=.man.in uninstall-man-pages)
-
 .PHONY: install-man-pages uninstall-man-pages
 
 # Rules for cleaning
diff --git a/configure b/configure
index 6c2d41f0cd8..602eacafe96 100755
--- a/configure
+++ b/configure
@@ -741,7 +741,6 @@ AR
 BISON
 FLEX
 TOOLSDIR
-WOW64_DISABLE
 TARGETFLAGS
 CPPBIN
 ac_ct_CXX
@@ -4775,8 +4774,6 @@ then
         as_fn_error $? "--enable-win64 and --with-wine64 are mutually exclusive.
 --enable-win64 should be used in the 64-bit build tree, --with-wine64 in the 32-bit Wow64 build tree." "$LINENO" 5
     fi
-    WOW64_DISABLE=\#
-
     enable_fonts=${enable_fonts:-no}
     enable_server=${enable_server:-no}
 elif test "x$enable_win64" = "xyes"
diff --git a/configure.ac b/configure.ac
index 763889b3ff5..fc4f096db80 100644
--- a/configure.ac
+++ b/configure.ac
@@ -194,7 +194,6 @@ then
         AC_MSG_ERROR([--enable-win64 and --with-wine64 are mutually exclusive.
 --enable-win64 should be used in the 64-bit build tree, --with-wine64 in the 32-bit Wow64 build tree.])
     fi
-    AC_SUBST([WOW64_DISABLE],[\#])
     enable_fonts=${enable_fonts:-no}
     enable_server=${enable_server:-no}
 elif test "x$enable_win64" = "xyes"
diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in
index dba64f6c887..3a226ce4432 100644
--- a/dlls/Makedll.rules.in
+++ b/dlls/Makedll.rules.in
@@ -16,7 +16,6 @@ IMPLIB_OBJS = $(IMPLIB_SRCS:.c=.o)
 IMPLIBFLAGS = $(TARGETFLAGS) $(EXTRAIMPLIBFLAGS)
 IMPORTLIBFILE = $(IMPORTLIB:%=lib%.@IMPLIBEXT@)
 STATICIMPLIB  = $(IMPORTLIBFILE:.def=.def.a)
-INSTALLDIRS = $(DESTDIR)$(dlldir) $(DESTDIR)$(fakedlldir) $(DESTDIR)$(datadir)/wine
 
 @MAKE_RULES@
 
@@ -63,24 +62,6 @@ sgmlpages:: $(C_SRCS) dummy
 xmlpages:: $(C_SRCS) dummy
 	$(C2MAN) -o $(top_builddir)/documentation/api-guide-xml -R$(top_builddir) -C$(srcdir) $(INCLUDES) -Tx $(MAINSPEC:%=-w %) $(C_SRCS)
 
-# Rules for installation
-
-.PHONY: install_dll install_dll.so install_dll.fake
-
-install_dll: $(MODULE) $(DESTDIR)$(dlldir) dummy
-	$(INSTALL_PROGRAM) $(MODULE) $(DESTDIR)$(dlldir)/$(MODULE)
-
-install_dll.so: $(MODULE).so $(DESTDIR)$(dlldir) dummy
-	$(INSTALL_PROGRAM) $(MODULE).so $(DESTDIR)$(dlldir)/$(DLLPREFIX)$(MODULE).so
-
-install_dll.fake: $(MODULE).fake $(DESTDIR)$(fakedlldir) dummy
-	$(INSTALL_DATA) $(MODULE).fake $(DESTDIR)$(fakedlldir)/$(MODULE)
-
-install install-lib:: install_dll$(DLLEXT) install_dll$(FAKEEXT)
-
-uninstall::
-	$(RM) $(DESTDIR)$(dlldir)/$(DLLPREFIX)$(MODULE)$(DLLEXT) $(DESTDIR)$(fakedlldir)/$(MODULE)
-
 # Misc. rules
 
 clean::
diff --git a/programs/Makeprog.rules.in b/programs/Makeprog.rules.in
index f72ad2e1dba..802baff50fd 100644
--- a/programs/Makeprog.rules.in
+++ b/programs/Makeprog.rules.in
@@ -11,7 +11,6 @@
 
 DLLFLAGS    = @DLLFLAGS@
 ALL_LIBS    = $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(EXTRALIBS) -lwine $(LIBPORT) $(LDFLAGS) $(LIBS)
-INSTALLDIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(dlldir) $(DESTDIR)$(fakedlldir) $(DESTDIR)$(mandir)/man$(prog_manext)
 
 @MAKE_RULES@
 
@@ -20,23 +19,5 @@ all: $(MODULE)$(DLLEXT) $(MODULE)$(FAKEEXT)
 $(MODULE) $(MODULE).so $(MODULE).fake: $(OBJS) Makefile.in
 	$(WINEGCC) $(APPMODE) $(OBJS) -o $@ $(ALL_LIBS) $(DELAYIMPORTS:%=-Wb,-d%)
 
-# Rules for installation
-
-.PHONY: install_prog install_prog.so install_prog.fake
-
-install_prog.so: $(MODULE).so $(DESTDIR)$(dlldir) dummy
-	$(INSTALL_PROGRAM) $(MODULE).so $(DESTDIR)$(dlldir)/$(DLLPREFIX)$(MODULE).so
-
-install_prog.fake: $(MODULE).fake $(DESTDIR)$(fakedlldir) dummy
-	$(INSTALL_DATA) $(MODULE).fake $(DESTDIR)$(fakedlldir)/$(MODULE)
-
-install_prog: $(MODULE) $(DESTDIR)$(bindir) dummy
-	$(INSTALL_PROGRAM) $(MODULE) $(DESTDIR)$(bindir)/$(MODULE)
-
-install install-lib:: install_prog$(DLLEXT) install_prog$(FAKEEXT)
-
-uninstall::
-	$(RM) $(DESTDIR)$(bindir)/$(MODULE) $(DESTDIR)$(dlldir)/$(DLLPREFIX)$(MODULE)$(DLLEXT) $(DESTDIR)$(fakedlldir)/$(MODULE)
-
 clean::
 	$(RM) $(MODULE)