mirror of
https://github.com/gryf/wmaker.git
synced 2026-01-05 21:34:17 +01:00
menu: Write data directory during build instead of with wmaker.inst.
Many of the menu files contain the macro #wmdatadir# as a placeholder for the data directory containing Window Maker themes, styles, background pixmaps, etc. This macro is replaced by the the actual path to the data directory (by default /usr/local/share/WindowMaker) by the wmaker.inst script, but only when copying WMRootMenu to the user's home directory. Instead, we replace the macro during the build. This way, *every* menu file has the correct path. Note that several of the files in question were not previously generated during build. These have been renamed with a .in extension.
This commit is contained in:
committed by
Carlos R. Mafra
parent
273d17a0be
commit
d364afff02
@@ -62,12 +62,8 @@ copy() {
|
||||
if [ "$file" = "WindowMaker" ]; then
|
||||
sed -e "s|~/GNUstep|$GSDIR|g" "$source" > "$target"
|
||||
else
|
||||
if test "x$GNUSTEP_USER_ROOT" = "x"; then
|
||||
sed -e "s:#wmdatadir#:$GLOBALDIR:g" \
|
||||
"$source" > "$target"
|
||||
else
|
||||
if test "x$GNUSTEP_USER_ROOT" != "x"; then
|
||||
sed -e "s|\$HOME/GNUstep|$GSDIR|g" \
|
||||
-e "s:#wmdatadir#:$GLOBALDIR:g" \
|
||||
"$source" > "$target"
|
||||
fi
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user