Commit graph

6 commits

Author SHA1 Message Date
Dan Nicholson
bbbdab4c60 Don't override empty prefix setting
If the original prefix setting is empty, skip prepending the redefined
prefix to other variables. This works the same as if the pc file doesn't
have a prefix variable at all.

https://bugs.freedesktop.org/show_bug.cgi?id=97453-empty
2016-08-30 09:41:54 -07:00
Dan Nicholson
cdaa522911 Fix relocatable test in wine
Wine outputs the paths with carriage returns, which later breaks
commands they're used in. Hopefully this doesn't break the msys case,
but I think it should be safe enough. Really this needs general handling
of Windows paths instead of ad hoc fixes, but that's for another day.

https://bugs.freedesktop.org/show_bug.cgi?id=66939
2015-02-21 11:37:49 -08:00
Dan Nicholson
2808a5497c check: Test that the pcfiledir variable is output correctly 2014-12-09 06:23:33 -08:00
Dan Nicholson
dbf1b7cd09 check: Convert paths to Windows format when using --define-prefix
When pkg-config redefines the .pc file's prefix variable, it will be in
the platform's native format. Convert the expected results as
necessary. This only affects the relocatable test because it explicitly
sets --define-prefix or uses .pc files in a pkgconfig/ directory. Other
tests do not have their prefixes redefined for this reason.
2013-05-31 05:31:02 -07:00
Dan Nicholson
719abc7910 check: Make relocatable script executable 2013-05-22 05:28:54 -07:00
Dan Nicholson
32427bf2c6 check: Test relocatable features
Exercise the ${pcfiledir} and --define-prefix features for allowing
relocation of packages. The --define-prefix test .pc files are put in a
pkgconfig subdirectory since the feature will only be enabled in that
situation.
2013-05-17 05:13:15 -07:00