[vlc-commits] [Git][videolan/vlc][master] contrib: change_prefix: handle relocatable prefix

Jean-Baptiste Kempf (@jbk) gitlab at videolan.org
Tue Aug 8 10:54:37 UTC 2023



Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC


Commits:
2206ae97 by Johannes Kauffmann at 2023-08-08T08:33:43+00:00
contrib: change_prefix: handle relocatable prefix

Handle the special pkg-config variable ${pcfiledir}, this is meant to
make .pc files relocatable. See:

https://gitlab.freedesktop.org/pkg-config/pkg-config/-/blob/d97db4fae4c1cd099b506970b285dc2afd818ea2/pkg-config.1#L400

- - - - -


1 changed file:

- contrib/src/change_prefix.sh


Changes:

=====================================
contrib/src/change_prefix.sh
=====================================
@@ -67,6 +67,10 @@ process() {
         then
             # Ensure the file we're checking contains a prefix
             if grep -q '^prefix=' $file; then
+                # Skip .pc files with a relocatable prefix
+                if grep -q '${pcfiledir}' $file; then
+                    continue
+                fi
                 # And if it does, ensure it's correctly pointing to the configured one
                 if ! grep -q $old_prefix $file; then
                     echo "Can't find the old_prefix ($old_prefix) in file $file:"



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

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


VideoLAN code repository instance


More information about the vlc-commits mailing list