[vlc-commits] [Git][videolan/vlc][master] 3 commits: use pkgdatadir for upnp_server data files

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
39706d39 by Olaf Hering at 2026-04-23T06:27:48+00:00
use pkgdatadir for upnp_server data files

Signed-off-by: Olaf Hering <olaf at aepfle.de>

- - - - -
f4f2f94b by Olaf Hering at 2026-04-23T06:27:48+00:00
use pkgdatadir for lua and skins2 data files on win32

Signed-off-by: Olaf Hering <olaf at aepfle.de>

- - - - -
9dabeb01 by Olaf Hering at 2026-04-23T06:27:48+00:00
use pkglibdir to process plugin files on win32

Signed-off-by: Olaf Hering <olaf at aepfle.de>

- - - - -


2 changed files:

- extras/package/win32/package.mak
- modules/services_discovery/Makefile.am


Changes:

=====================================
extras/package/win32/package.mak
=====================================
@@ -32,9 +32,9 @@ package-win-install:
 if ENABLE_PDB
 	cp lib/.libs/libvlc.pdb '$(DESTDIR)$(bindir)'
 	cp src/.libs/libvlccore.pdb '$(DESTDIR)$(bindir)'
-	find '$(DESTDIR)$(libdir)/vlc/plugins' -name "*.dll" -exec sh -c "echo {} | sed -e 's@$(DESTDIR)$(libdir)/vlc/plugins/\(.*\)/\(.*\).dll at modules/.libs/\2.pdb $(DESTDIR)$(libdir)/vlc/plugins/\1@' | xargs -t cp " \;
+	find '$(DESTDIR)$(pkglibdir)/plugins' -name "*.dll" -exec sh -c "echo {} | sed -e 's@$(DESTDIR)$(pkglibdir)/plugins/\(.*\)/\(.*\).dll at modules/.libs/\2.pdb $(DESTDIR)$(pkglibdir)/plugins/\1@' | xargs -t cp " \;
 if ENABLE_QT
-	find modules/gui/qt/.libs/ -name "*.pdb" -exec cp {} '$(DESTDIR)$(libdir)/vlc/plugins/gui/' \;
+	find modules/gui/qt/.libs/ -name "*.pdb" -exec cp {} '$(DESTDIR)$(pkglibdir)/plugins/gui/' \;
 endif
 endif
 	touch $@
@@ -67,13 +67,13 @@ endif
 	cp "$(srcdir)/README.md" "$(win32_destdir)/README.txt"
 
 	cp $(srcdir)/share/icons/vlc.ico $(win32_destdir)
-	for plugindir in $(prefix)/lib/vlc/plugins/*/; do \
+	for plugindir in $(pkglibdir)/plugins/*/; do \
 		plugin_destdir="$(win32_destdir)/plugins/`basename $$plugindir`"; \
 		mkdir -p "$$plugin_destdir"; \
 		find "$$plugindir" -type f \( -not -name '*.la' -and -not -name '*.a' \) -exec cp -v "{}" "$$plugin_destdir" \; ;\
 	done
 if ENABLE_PDB
-	for plugindir in $(prefix)/lib/vlc/plugins/*/; do \
+	for plugindir in $(pkglibdir)/plugins/*/; do \
 		plugin_destdir="$(win32_destdir)/plugins/`basename $$plugindir`"; \
 		for plugin in $$(find "$$plugindir" -type f \( -not -name '*.la' -and -not -name '*.a' \)); do cp modules/.libs/$$(basename "$$plugin" | sed s/dll/pdb/) "$$plugin_destdir"; done; \
 	done
@@ -86,12 +86,12 @@ endif
 if BUILD_LUA
 	mkdir -p $(win32_destdir)/lua/
 	cp -r $(pkglibexecdir)/lua/* $(win32_destdir)/lua/
-	cp -r $(prefix)/share/vlc/lua/* $(win32_destdir)/lua/
+	cp -r $(pkgdatadir)/lua/* $(win32_destdir)/lua/
 endif
 
 if BUILD_SKINS
 	rm -fr $(win32_destdir)/skins
-	cp -r $(prefix)/share/vlc/skins2 $(win32_destdir)/skins
+	cp -r $(pkgdatadir)/skins2 $(win32_destdir)/skins
 endif
 
 # HRTF


=====================================
modules/services_discovery/Makefile.am
=====================================
@@ -74,7 +74,7 @@ libupnp_plugin_la_RES = ../share/upnp_server/ContentDirectory.xml \
 	../share/upnp_server/vlc.png \
 	../share/upnp_server/vlc512x512.png
 dist_libupnp_plugin_la_DATA = $(libupnp_plugin_la_RES)
-libupnp_plugin_ladir = $(prefix)/share/vlc/upnp_server
+libupnp_plugin_ladir = $(pkgdatadir)/upnp_server
 endif
 EXTRA_LTLIBRARIES += libupnp_plugin.la
 sd_PLUGINS += $(LTLIBupnp)



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/c7470a3b703552b395d3b53eec75d813a591f330...9dabeb01a97c4b46e217ad2f6d9156291f466fc1

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/c7470a3b703552b395d3b53eec75d813a591f330...9dabeb01a97c4b46e217ad2f6d9156291f466fc1
You're receiving this email because of your account on code.videolan.org.