[vlc-commits] [Git][videolan/vlc][master] qt: Makefile.am: symlink vlc-qt-check to modules/

[Alexandre Janniaux (@alexandre-janniaux)]

Alexandre Janniaux pushed to branch master at VideoLAN / VLC


Commits:
cd3a5912 by Alexandre Janniaux at 2023-12-20T17:23:17+00:00
qt: Makefile.am: symlink vlc-qt-check to modules/

vlc-qt-check is found using VLC_PKG_LIBEXEC_DIR which falls back to
VLC_LIB_PATH. In vlc-static, VLC_LIB_PATH is defined by the following
snippet:

    #ifdef TOP_BUILDDIR
        setenv ("VLC_PLUGIN_PATH", TOP_BUILDDIR"/modules", 1);
        setenv ("VLC_DATA_PATH", TOP_SRCDIR"/share", 1);
        setenv ("VLC_LIB_PATH", TOP_BUILDDIR"/modules", 1);
    #endif

With the previous changes in ddfc6d0de8ae0f450895ec5cee6626e4efacb422,
the vlc-qt-check executable is not built into TOP_BUILDDIR/modules/
anymore, but in TOP_BUILDDIR/modules/gui/qt/ instead, and won't be found
on platforms requiring it.

When installing, it is still located at the right place, but this commit
adds a symbolic link to modules/ to ensure we can also find it with
vlc-static.

- - - - -


1 changed file:

- modules/gui/qt/Makefile.am


Changes:

=====================================
modules/gui/qt/Makefile.am
=====================================
@@ -1150,6 +1150,10 @@ BUILT_SOURCES += $(nodist_libqt_plugin_la_SOURCES)
 if !HAVE_WIN32
 if !HAVE_OS2
 pkglibexec_PROGRAMS = vlc-qt-check
+all-local: $(builddir)/../../vlc-qt-check
+
+$(builddir)/../../vlc-qt-check: vlc-qt-check
+	$(AM_V_GEN)cd ../../ && $(LN_S) -f gui/qt/vlc-qt-check . && chmod +x vlc-qt-check
 endif
 endif
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/cd3a5912b5f91598ccbb484d219370fdd382162e

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/cd3a5912b5f91598ccbb484d219370fdd382162e
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance