Alexandre Julliard : configure: Disable installation of a number of extra files for the Wow64 build.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 90647774575f2c67dd777f858f4e00f818249254
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=90647774575f2c67dd777f858f...

Author: Alexandre Julliard 
Date:   Thu Aug 13 19:48:42 2009 +0200

configure: Disable installation of a number of extra files for the Wow64 build.

---

Makefile.in                 |    7 +++++--
 configure                   |    3 +++
 configure.ac                |    1 +
 dlls/wineps.drv/Makefile.in |    6 +++++-
 loader/Makefile.in          |    8 ++++++--
 programs/Makefile.in        |    2 +-
 6 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 7c1eb50..690b003 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -75,8 +75,11 @@ wine: $(WINEWRAPPER)

# Installation rules

-install install-dev:: $(DESTDIR)$(datadir)/aclocal dummy
-	$(INSTALL_DATA) $(SRCDIR)/aclocal.m4 $(DESTDIR)$(datadir)/aclocal/wine.m4
+install-aclocal: $(DESTDIR)$(datadir)/aclocal dummy
+
+.PHONY: install-aclocal
+
+@WOW64_DISABLE@ install install-dev:: install-aclocal

uninstall::
    $(RM) $(DESTDIR)$(datadir)/aclocal/wine.m4
diff --git a/configure b/configure
index 8d9f023..06d06ee 100755
--- a/configure
+++ b/configure
@@ -695,6 +695,7 @@ AR
 BISON
 FLEX
 TOOLSDIR
+WOW64_DISABLE
 WIN16_INSTALL
 WIN16_FILES
 TARGETFLAGS
@@ -4067,6 +4068,8 @@ 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_include=${enable_include:-no}
     enable_server=${enable_server:-no}
diff --git a/configure.ac b/configure.ac
index fb83660..a38c525 100644
--- a/configure.ac
+++ b/configure.ac
@@ -183,6 +183,7 @@ 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_include=${enable_include:-no}
     enable_server=${enable_server:-no}
diff --git a/dlls/wineps.drv/Makefile.in b/dlls/wineps.drv/Makefile.in
index 0adfc0c..7e8efdc 100644
--- a/dlls/wineps.drv/Makefile.in
+++ b/dlls/wineps.drv/Makefile.in
@@ -98,9 +98,13 @@ EXTRASUBDIRS = data

@MAKE_DLL_RULES@

-install install-lib:: $(DESTDIR)$(datadir)/wine
+install-ppd:: $(DESTDIR)$(datadir)/wine dummy
    $(INSTALL_DATA) $(SRCDIR)/generic.ppd $(DESTDIR)$(datadir)/wine/generic.ppd

+.PHONY: install-ppd
+
+@WOW64_DISABLE@ install install-lib:: install-ppd
+
 uninstall::
    $(RM) $(DESTDIR)$(datadir)/wine/generic.ppd

diff --git a/loader/Makefile.in b/loader/Makefile.in
index 0ce816a..9bef13f 100644
--- a/loader/Makefile.in
+++ b/loader/Makefile.in
@@ -45,10 +45,14 @@ wine-installed: main.o Makefile.in
 $(EXTRA_BINARIES:%=__install__%): $(EXTRA_BINARIES) $(DESTDIR)$(bindir) dummy
    f=`expr $@ : '__install__(.*)'` && $(INSTALL_PROGRAM) $$f $(DESTDIR)$(bindir)/$$f

-.PHONY: $(EXTRA_BINARIES:%=__install__%)
+.PHONY: install-man-pages $(EXTRA_BINARIES:%=__install__%)

-install install-lib:: wine-installed $(EXTRA_BINARIES:%=__install__%) $(MANPAGES) $(INSTALLDIRS)
+install install-lib:: wine-installed $(DESTDIR)$(bindir) $(EXTRA_BINARIES:%=__install__%)
    $(INSTALL_PROGRAM) wine-installed $(DESTDIR)$(bindir)/$(MODULE)
+
+@WOW64_DISABLE@ install install-lib:: install-man-pages
+
+install-man-pages: $(MANPAGES) $(INSTALLDIRS) dummy
    $(INSTALL_DATA) wine.man $(DESTDIR)$(mandir)/man$(prog_manext)/wine.$(prog_manext)
    $(INSTALL_DATA) wine.de.man $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/wine.$(prog_manext)
    $(INSTALL_DATA) wine.fr.man $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)/wine.$(prog_manext)
diff --git a/programs/Makefile.in b/programs/Makefile.in
index 7bd60b2..fcfeb50 100644
--- a/programs/Makefile.in
+++ b/programs/Makefile.in
@@ -33,7 +33,7 @@ install-progs.so: $(INSTALLPROGS:%=%/__installprog__)

install-progs: # nothing to do here

-install install-lib:: install-progs$(DLLEXT) $(INSTALLDIRS)
+@WOW64_DISABLE@ install install-lib:: install-progs$(DLLEXT) $(INSTALLDIRS)

uninstall::
    -cd $(DESTDIR)$(bindir) && $(RM) wineapploader $(INSTALLPROGS)