Alexandre Julliard : makefiles: Install source directory files from the top-level makefile.
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Nov 13 08:34:46 CST 2015
Module: wine
Branch: master
Commit: 9b71b3669e3065eefe7a6e1c4559fe44ad728415
URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b71b3669e3065eefe7a6e1c4559fe44ad728415
Author: Alexandre Julliard <julliard at winehq.org>
Date: Fri Nov 13 16:07:49 2015 +0900
makefiles: Install source directory files from the top-level makefile.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
configure | 25 ++++++++++---------------
configure.ac | 27 ++++++++++++---------------
2 files changed, 22 insertions(+), 30 deletions(-)
diff --git a/configure b/configure
index 0aa17fc..8b0b2c9 100755
--- a/configure
+++ b/configure
@@ -8763,15 +8763,6 @@ libwine_DEPS = wine.map
${wine_binary}_OBJS = main.o
${wine_binary}_LDFLAGS = $LDEXECFLAGS -lwine \$(PTHREAD_LIBS)
"
- if test -z "$with_wine64"
- then
- as_fn_append LOADER_RULES "
-install install-lib::
- \$(INSTALL_DATA) \$(srcdir)/wine.desktop \$(DESTDIR)\$(datadir)/applications/wine.desktop
-uninstall::
- \$(RM) \$(DESTDIR)\$(datadir)/applications/wine.desktop
-"
- fi
;;
esac
@@ -18319,13 +18310,17 @@ 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::
- \$(INSTALL_DATA) \$(srcdir)/l_intl.nls \$(DESTDIR)\$(datadir)/wine/l_intl.nls
-
+ wine_fn_append_rule "install install-lib::
+ \$(INSTALL_DATA) $srcdir/loader/l_intl.nls \$(DESTDIR)\$(datadir)/wine/l_intl.nls
uninstall::
- \$(RM) \$(DESTDIR)\$(datadir)/wine/l_intl.nls
-"
+ \$(RM) \$(DESTDIR)\$(datadir)/wine/l_intl.nls"
+ case $host_os in
+ cygwin*|mingw32*|darwin*|macosx*|linux-android*) ;;
+ *) wine_fn_append_rule "install install-lib::
+ \$(INSTALL_DATA) $srcdir/loader/wine.desktop \$(DESTDIR)\$(datadir)/applications/wine.desktop
+uninstall::
+ \$(RM) \$(DESTDIR)\$(datadir)/applications/wine.desktop" ;;
+ esac
fi
as_fn_append LOADER_RULES "
diff --git a/configure.ac b/configure.ac
index 685b346..f86fd2b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -962,15 +962,6 @@ libwine_DEPS = wine.map
${wine_binary}_OBJS = main.o
${wine_binary}_LDFLAGS = $LDEXECFLAGS -lwine \$(PTHREAD_LIBS)
"])
- if test -z "$with_wine64"
- then
- AS_VAR_APPEND([LOADER_RULES],["
-install install-lib::
- \$(INSTALL_DATA) \$(srcdir)/wine.desktop \$(DESTDIR)\$(datadir)/applications/wine.desktop
-uninstall::
- \$(RM) \$(DESTDIR)\$(datadir)/applications/wine.desktop
-"])
- fi
;;
esac
@@ -3692,13 +3683,19 @@ 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::
- \$(INSTALL_DATA) \$(srcdir)/l_intl.nls \$(DESTDIR)\$(datadir)/wine/l_intl.nls
-
+ WINE_APPEND_RULE(
+[install install-lib::
+ \$(INSTALL_DATA) $srcdir/loader/l_intl.nls \$(DESTDIR)\$(datadir)/wine/l_intl.nls
uninstall::
- \$(RM) \$(DESTDIR)\$(datadir)/wine/l_intl.nls
-"])
+ \$(RM) \$(DESTDIR)\$(datadir)/wine/l_intl.nls])
+ case $host_os in
+ cygwin*|mingw32*|darwin*|macosx*|linux-android*) ;;
+ *) WINE_APPEND_RULE(
+[install install-lib::
+ \$(INSTALL_DATA) $srcdir/loader/wine.desktop \$(DESTDIR)\$(datadir)/applications/wine.desktop
+uninstall::
+ \$(RM) \$(DESTDIR)\$(datadir)/applications/wine.desktop]) ;;
+ esac
fi
AS_VAR_APPEND([LOADER_RULES],["
More information about the wine-cvs
mailing list