makefiles: Generate rules for installing wine.inf.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>

makefiles: Generate rules for installing wine.inf.
b8d138d6 · Alexandre Julliard · d1578a61 · b8d138d6 · b8d138d6 · b8d138d6
Commit b8d138d6 authored Nov 13, 2015 by Alexandre Julliard
Hide whitespace changes
Inline Side-by-side

Showing with 20 additions and 14 deletions

configure configure +9 -7

configure.ac configure.ac +9 -7

makedep.c tools/makedep.c +2 -0

No files found.
--- 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"

--- 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],

--- 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 */
        {