Jean-Baptiste Kempf pushed to branch 3.0.x at VideoLAN / VLC
Commits:
3908fb9a by Alexandre Janniaux at 2025-11-24T17:05:53+01:00
share: Makefile.am: use $(EGREP) instead of egrep
Fix the following warning:
egrep: warning: egrep is obsolescent; using grep -E
(cherry picked from commit c6ed4170a5aa38be847b63bc86daad87358ffb54)
Signed-off-by: Marvin Scholz <[email protected]>
- - - - -
844fb806 by Steve Lhomme at 2025-11-24T17:05:53+01:00
automake: use MKDIR_P instead of mkdir -p
(cherry picked from commit c87cbb73d9f2833df214049c93f06e9ffafe06d9)
Signed-off-by: Marvin Scholz <[email protected]>
- - - - -
3 changed files:
- modules/gui/macosx/Makefile.am
- share/Makefile.am
- src/Makefile.am
Changes:
=====================================
modules/gui/macosx/Makefile.am
=====================================
@@ -195,7 +195,7 @@ xib_verbose_0 = @echo " XIB " $@;
xib_verbose__0 = $(xib_verbose_0)
.xib.nib:
- $(AM_V_at)mkdir -p -- gui/macosx/UI
+ $(AM_V_at)$(MKDIR_P) -- gui/macosx/UI
$(xib_verbose)$(XIB) --errors --warnings --notices \
--module VLC --auto-activate-custom-fonts --target-device mac \
--minimum-deployment-target 10.7 --output-format human-readable-text \
=====================================
share/Makefile.am
=====================================
@@ -15,7 +15,7 @@ EXTRA_DIST += vlc.desktop.in vlc.desktop.mimetypes
CLEANFILES += $(desktop_DATA) $(appdata_DATA)
vlc.desktop: vlc.desktop.in $(top_builddir)/config.status
- $(AM_V_GEN)mimetypes="$$(sed 's/\s*#.*$$//g'
$(srcdir)/vlc.desktop.mimetypes | egrep -v '^$$' | tr "\n" ';')"; \
+ $(AM_V_GEN)mimetypes="$$(sed 's/\s*#.*$$//g'
$(srcdir)/vlc.desktop.mimetypes | $(EGREP) -v '^$$' | tr "\n" ';')"; \
sed \
-e 's,\@bindir\@,$(bindir),g' \
-e "s,\@MIMETYPES\@,$$mimetypes,g" < "$<" > tmp-$@
@@ -89,7 +89,7 @@ skins2_default_vlt_FILES = \
skins2/default/subX/vol_slider.png
skins2/default.vlt: $(skins2_default_vlt_FILES)
- $(AM_V_at)mkdir -p skins2
+ $(AM_V_at)$(MKDIR_P) "skins2"
$(AM_V_at)rm -f -- skins2/default.vlt.tmp
$(AM_V_GEN)tarsort= ; \
tar --help|grep -q sort=ORDER && tarsort=--sort=name ; \
@@ -116,7 +116,7 @@ luac_verbose_0 = @echo " LUAC $@";
done; \
echo "Attempt to byte-compile unknown file: $(<)!"; \
exit 1
- $(AM_V_at)mkdir -p "$$(dirname '$@')"
+ $(AM_V_at)$(MKDIR_P) "$$(dirname '$@')"
$(luac_verbose)$(LUAC) -o $@ $<
if BUILD_LUA
=====================================
src/Makefile.am
=====================================
@@ -123,7 +123,7 @@ noinst_HEADERS = \
../include/vlc_about.h: Makefile.am $(top_srcdir)/COPYING $(top_srcdir)/THANKS
$(top_srcdir)/AUTHORS
$(AM_V_at)rm -f -- "[email protected]"
- $(AM_V_at)mkdir -p -- ../include
+ $(AM_V_at)$(MKDIR_P) "../include"
$(AM_V_GEN)(echo "/* Automatically generated file - DO NOT EDIT */" && \
echo "static const char psz_license[] =" && \
sed 's/"/\\"/g;s/^.*$$/\"&\\n\"/' "$(top_srcdir)/COPYING" && \
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/761bbd3e0dcf0dcafbda2e3edd895e94b9690635...844fb8060ea968d078dc2b7c6fcafdc4e55da9af
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/761bbd3e0dcf0dcafbda2e3edd895e94b9690635...844fb8060ea968d078dc2b7c6fcafdc4e55da9af
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits
