configure: Disable installation of a number of extra files for the Wow64 build.
This commit is contained in:
parent
39a75d374d
commit
9064777457
|
@ -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
|
||||
|
|
|
@ -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}
|
||||
|
|
|
@ -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}
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue