Alexandre Julliard : makefiles: Generate rules for installing wine.inf.

[Alexandre Julliard]

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

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Fri Nov 13 15:16:16 2015 +0900

makefiles: Generate rules for installing wine.inf.

Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 configure       | 16 +++++++++-------
 configure.ac    | 16 +++++++++-------
 tools/makedep.c |  2 ++
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/configure b/configure
index 51a6913..0aa17fc 100755
--- a/configure
+++ b/configure
@@ -7865,6 +7865,7 @@ distclean::
 wine_binary="wine"
 test "x$enable_win64" != "xyes" || wine_binary="wine64"
 loader_programs="$wine_binary"
+loader_install=""
 libwine_soversion=`expr $libwine_version : '\([0-9]*\)\..*'`
 
 case $host_os in
@@ -14979,10 +14980,6 @@ ${wine_binary}_preloader_LDFLAGS = -static -nostartfiles -nodefaultlibs -Wl,-Tte
     esac
     ;;
 esac
-as_fn_append LOADER_RULES "
-PROGRAMS = $loader_programs
-INSTALL_LIB = $loader_programs
-"
 
 
 ac_save_CFLAGS="$CFLAGS"
@@ -18321,16 +18318,21 @@ $with_wine64/loader/wine-preloader:
 clean::
 	\$(RM) fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader"
 else
+    loader_install="$loader_install wine.inf"
     as_fn_append LOADER_RULES "
-install install-lib:: wine.inf
-	\$(INSTALL_DATA) wine.inf \$(DESTDIR)\$(datadir)/wine/wine.inf
+install install-lib::
 	\$(INSTALL_DATA) \$(srcdir)/l_intl.nls \$(DESTDIR)\$(datadir)/wine/l_intl.nls
 
 uninstall::
-	\$(RM) \$(DESTDIR)\$(datadir)/wine/wine.inf \$(DESTDIR)\$(datadir)/wine/l_intl.nls
+	\$(RM) \$(DESTDIR)\$(datadir)/wine/l_intl.nls
 "
 fi
 
+as_fn_append LOADER_RULES "
+PROGRAMS = $loader_programs
+INSTALL_LIB = $loader_programs$loader_install
+"
+
 if test "$srcdir" = .
 then
     ac_config_commands="$ac_config_commands .gitignore"
diff --git a/configure.ac b/configure.ac
index 4e9ca89..685b346 100644
--- a/configure.ac
+++ b/configure.ac
@@ -688,6 +688,7 @@ WINE_CONFIG_HELPERS
 wine_binary="wine"
 test "x$enable_win64" != "xyes" || wine_binary="wine64"
 loader_programs="$wine_binary"
+loader_install=""
 libwine_soversion=`expr $libwine_version : '\([[0-9]]*\)\..*'`
 
 case $host_os in
@@ -1981,10 +1982,6 @@ ${wine_binary}_preloader_LDFLAGS = -static -nostartfiles -nodefaultlibs -Wl,-Tte
     esac
     ;;
 esac
-AS_VAR_APPEND([LOADER_RULES],["
-PROGRAMS = $loader_programs
-INSTALL_LIB = $loader_programs
-"])
 
 dnl **** Check for functions ****
 
@@ -3694,16 +3691,21 @@ $with_wine64/loader/wine-preloader:
 clean::
 	\$(RM) fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader])
 else
+    loader_install="$loader_install wine.inf"
     AS_VAR_APPEND([LOADER_RULES],["
-install install-lib:: wine.inf
-	\$(INSTALL_DATA) wine.inf \$(DESTDIR)\$(datadir)/wine/wine.inf
+install install-lib::
 	\$(INSTALL_DATA) \$(srcdir)/l_intl.nls \$(DESTDIR)\$(datadir)/wine/l_intl.nls
 
 uninstall::
-	\$(RM) \$(DESTDIR)\$(datadir)/wine/wine.inf \$(DESTDIR)\$(datadir)/wine/l_intl.nls
+	\$(RM) \$(DESTDIR)\$(datadir)/wine/l_intl.nls
 "])
 fi
 
+AS_VAR_APPEND([LOADER_RULES],["
+PROGRAMS = $loader_programs
+INSTALL_LIB = $loader_programs$loader_install
+"])
+
 if test "$srcdir" = .
 then
     AC_CONFIG_COMMANDS([.gitignore], [wine_fn_output_gitignore .gitignore],
diff --git a/tools/makedep.c b/tools/makedep.c
index 75c7d91..469b833 100644
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -2254,6 +2254,8 @@ static struct strarray output_sources( const struct makefile *make, struct strar
             output( "%s:", obj_dir_path( make, obj ));
             output_filenames( dependencies );
             output( "\n" );
+            add_install_rule( make, install_rules, obj, xstrdup( obj ),
+                              strmake( "d$(datadir)/wine/%s", obj ));
         }
         else if (!strcmp( ext, "sfd" ))  /* font file */
         {