Alexandre Julliard : configure: Always build wine.inf even if we don' t install it.
Module: wine Branch: master Commit: 3bbbb6d5a73d8c45329d72f1f980377ede79f4c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bbbb6d5a73d8c45329d72f1f9... Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 3 21:20:38 2014 +0200 configure: Always build wine.inf even if we don't install it. --- configure | 4 ++-- configure.ac | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 97ee520..7c2a944 100755 --- a/configure +++ b/configure @@ -7535,6 +7535,8 @@ loader_programs="$wine_binary wine-installed" libwine_soversion=`expr $libwine_version : '\([0-9]*\)\..*'` LOADER_RULES=" +all: wine.inf + install install-lib:: wine-installed \$(INSTALL_PROGRAM) wine-installed \$(DESTDIR)\$(bindir)/$wine_binary @@ -17565,8 +17567,6 @@ clean:: \$(RM) fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader" else as_fn_append LOADER_RULES " -all: wine.inf - install install-lib:: wine.inf install-man-pages \$(INSTALL_DATA) wine.inf \$(DESTDIR)\$(datadir)/wine/wine.inf \$(INSTALL_DATA) \$(srcdir)/l_intl.nls \$(DESTDIR)\$(datadir)/wine/l_intl.nls diff --git a/configure.ac b/configure.ac index 7d297b0..c913f9f 100644 --- a/configure.ac +++ b/configure.ac @@ -684,6 +684,8 @@ loader_programs="$wine_binary wine-installed" libwine_soversion=`expr $libwine_version : '\([[0-9]]*\)\..*'` AC_SUBST(LOADER_RULES,[" +all: wine.inf + install install-lib:: wine-installed \$(INSTALL_PROGRAM) wine-installed \$(DESTDIR)\$(bindir)/$wine_binary @@ -3557,8 +3559,6 @@ clean:: \$(RM) fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader]) else AS_VAR_APPEND([LOADER_RULES],[" -all: wine.inf - install install-lib:: wine.inf install-man-pages \$(INSTALL_DATA) wine.inf \$(DESTDIR)\$(datadir)/wine/wine.inf \$(INSTALL_DATA) \$(srcdir)/l_intl.nls \$(DESTDIR)\$(datadir)/wine/l_intl.nls
participants (1)
-
Alexandre Julliard