Commit 90647774 authored by Alexandre Julliard's avatar Alexandre Julliard

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

parent 39a75d37
...@@ -75,8 +75,11 @@ wine: $(WINEWRAPPER) ...@@ -75,8 +75,11 @@ wine: $(WINEWRAPPER)
# Installation rules # Installation rules
install install-dev:: $(DESTDIR)$(datadir)/aclocal dummy install-aclocal: $(DESTDIR)$(datadir)/aclocal dummy
$(INSTALL_DATA) $(SRCDIR)/aclocal.m4 $(DESTDIR)$(datadir)/aclocal/wine.m4
.PHONY: install-aclocal
@WOW64_DISABLE@ install install-dev:: install-aclocal
uninstall:: uninstall::
$(RM) $(DESTDIR)$(datadir)/aclocal/wine.m4 $(RM) $(DESTDIR)$(datadir)/aclocal/wine.m4
......
...@@ -695,6 +695,7 @@ AR ...@@ -695,6 +695,7 @@ AR
BISON BISON
FLEX FLEX
TOOLSDIR TOOLSDIR
WOW64_DISABLE
WIN16_INSTALL WIN16_INSTALL
WIN16_FILES WIN16_FILES
TARGETFLAGS TARGETFLAGS
...@@ -4067,6 +4068,8 @@ then ...@@ -4067,6 +4068,8 @@ then
as_fn_error "--enable-win64 and --with-wine64 are mutually exclusive. 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 --enable-win64 should be used in the 64-bit build tree, --with-wine64 in the 32-bit Wow64 build tree." "$LINENO" 5
fi fi
WOW64_DISABLE=\#
enable_fonts=${enable_fonts:-no} enable_fonts=${enable_fonts:-no}
enable_include=${enable_include:-no} enable_include=${enable_include:-no}
enable_server=${enable_server:-no} enable_server=${enable_server:-no}
......
...@@ -183,6 +183,7 @@ then ...@@ -183,6 +183,7 @@ then
AC_MSG_ERROR([--enable-win64 and --with-wine64 are mutually exclusive. 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.]) --enable-win64 should be used in the 64-bit build tree, --with-wine64 in the 32-bit Wow64 build tree.])
fi fi
AC_SUBST([WOW64_DISABLE],[\#])
enable_fonts=${enable_fonts:-no} enable_fonts=${enable_fonts:-no}
enable_include=${enable_include:-no} enable_include=${enable_include:-no}
enable_server=${enable_server:-no} enable_server=${enable_server:-no}
......
...@@ -98,9 +98,13 @@ EXTRASUBDIRS = data ...@@ -98,9 +98,13 @@ EXTRASUBDIRS = data
@MAKE_DLL_RULES@ @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 $(INSTALL_DATA) $(SRCDIR)/generic.ppd $(DESTDIR)$(datadir)/wine/generic.ppd
.PHONY: install-ppd
@WOW64_DISABLE@ install install-lib:: install-ppd
uninstall:: uninstall::
$(RM) $(DESTDIR)$(datadir)/wine/generic.ppd $(RM) $(DESTDIR)$(datadir)/wine/generic.ppd
......
...@@ -45,10 +45,14 @@ wine-installed: main.o Makefile.in ...@@ -45,10 +45,14 @@ wine-installed: main.o Makefile.in
$(EXTRA_BINARIES:%=__install__%): $(EXTRA_BINARIES) $(DESTDIR)$(bindir) dummy $(EXTRA_BINARIES:%=__install__%): $(EXTRA_BINARIES) $(DESTDIR)$(bindir) dummy
f=`expr $@ : '__install__\(.*\)'` && $(INSTALL_PROGRAM) $$f $(DESTDIR)$(bindir)/$$f 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) $(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.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.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) $(INSTALL_DATA) wine.fr.man $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)/wine.$(prog_manext)
......
...@@ -33,7 +33,7 @@ install-progs.so: $(INSTALLPROGS:%=%/__installprog__) ...@@ -33,7 +33,7 @@ install-progs.so: $(INSTALLPROGS:%=%/__installprog__)
install-progs: # nothing to do here install-progs: # nothing to do here
install install-lib:: install-progs$(DLLEXT) $(INSTALLDIRS) @WOW64_DISABLE@ install install-lib:: install-progs$(DLLEXT) $(INSTALLDIRS)
uninstall:: uninstall::
-cd $(DESTDIR)$(bindir) && $(RM) wineapploader $(INSTALLPROGS) -cd $(DESTDIR)$(bindir) && $(RM) wineapploader $(INSTALLPROGS)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment