From 81b60830e8aa59b2d7fddeb48c678ba9df7e13c3 Mon Sep 17 00:00:00 2001 From: Daniel Caujolle-Bert Date: Thu, 27 Sep 2001 21:31:03 +0000 Subject: Add desktop stuff from patches by Miguel Freitas Fixed xine.m4 installation from Andrew Meredith CVS patchset: 705 CVS date: 2001/09/27 21:31:03 --- misc/xine-config.in | 7 +++++++ misc/xine-lib.spec.in | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'misc') diff --git a/misc/xine-config.in b/misc/xine-config.in index 8879e9fe6..5cc1c4c45 100644 --- a/misc/xine-config.in +++ b/misc/xine-config.in @@ -18,6 +18,7 @@ Options: [--cflags] [--plugindir] [--skindir] + [--desktopdir] EOF exit $1 } @@ -64,6 +65,9 @@ while test $# -gt 0; do --skindir) echo_skindir=yes ;; + --desktopdir) + echo_desktopdir=yes + ;; *) usage 1 1>&2 ;; @@ -92,3 +96,6 @@ fi if test "$echo_skindir" = "yes"; then echo "@XINE_SKINPATH@" fi +if test "$echo_desktopdir" = "yes"; then + echo "@XINE_DESKTOPPATH@" +fi diff --git a/misc/xine-lib.spec.in b/misc/xine-lib.spec.in index f8fec37ec..ac6789bf1 100644 --- a/misc/xine-lib.spec.in +++ b/misc/xine-lib.spec.in @@ -186,7 +186,7 @@ rm -rf $RPM_BUILD_ROOT %{prefix}/man/man3/vo_frame_t.3* %{prefix}/include/xine/*.h %{prefix}/include/xine.h -%{prefix}/share/aclocal/xine.m4 +@INSTALL_M4_TRUE@@ACLOCAL_DIR@/xine.m4 # input plugins %{prefix}/lib/xine/plugins/xineplug_inp_dvd.la %{prefix}/lib/xine/plugins/xineplug_inp_dvd.so @@ -304,6 +304,9 @@ rm -rf $RPM_BUILD_ROOT %{prefix}/share/doc/xine/README.dxr3 %changelog +* Thu Sep 27 2001 Daniel Caujolle-Bert +- Add desktop stuff from patches by Miguel Freitas +- Fixed xine.m4 installation from Andrew Meredith * Fri Sep 21 2001 Matthias Dahl - added two missing files (xine-config man page and xine.m4) * Sun Sep 16 2001 Daniel Caujolle-Bert -- cgit v1.2.3