don't hardcode the path to WPrefs, prompted by heko@

This commit is contained in:
wilfried 2001-09-07 14:11:28 +00:00
parent 06e7a32dc0
commit e669487621
4 changed files with 63 additions and 2 deletions

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-WindowMaker_menu,v 1.1 2001/09/07 14:11:28 wilfried Exp $
--- WindowMaker/menu.orig Tue Jul 25 02:07:44 2000
+++ WindowMaker/menu Fri Sep 7 15:16:40 2001
@@ -205,7 +205,7 @@
"Background" END
"Save Theme" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Theme name,Enter file name:)"
"Save IconSet" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(IconSet name,Enter file name:)"
- "Preferences Utility" EXEC /usr/local/GNUstep/Apps/WPrefs.app/WPrefs
+ "Preferences Utility" EXEC #wprefsdir#/WPrefs
"Appearance" END
"Exit" MENU

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-WindowMaker_plmenu,v 1.1 2001/09/07 14:11:28 wilfried Exp $
--- WindowMaker/plmenu.orig Fri Jan 14 17:48:18 2000
+++ WindowMaker/plmenu Fri Sep 7 15:16:52 2001
@@ -94,7 +94,7 @@
),
("Save Theme", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""),
("Save IconSet", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""),
- ("Preferences Utility", EXEC, "/usr/local/GNUstep/Apps/WPrefs.app/WPrefs")
+ ("Preferences Utility", EXEC, "#wprefsdir#/WPrefs")
),
("Exit",
("Restart", RESTART),

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-util_Makefile_in,v 1.1 2001/08/01 09:04:41 wilfried Exp $
$OpenBSD: patch-util_Makefile_in,v 1.2 2001/09/07 14:11:28 wilfried Exp $
--- util/Makefile.in.orig Mon Jul 23 22:03:14 2001
+++ util/Makefile.in Wed Aug 1 10:18:21 2001
+++ util/Makefile.in Fri Sep 7 15:34:04 2001
@@ -127,13 +127,13 @@ seticons_LDADD = $(liblist)
geticonset_LDADD = $(liblist)
@ -18,3 +18,11 @@ $OpenBSD: patch-util_Makefile_in,v 1.1 2001/08/01 09:04:41 wilfried Exp $
CLEANFILES = wmaker.inst wmchlocale
@@ -476,6 +476,7 @@ wmaker.inst: $(srcdir)/wmaker.inst.in ./
-rm -f wmaker.inst
sed -e "s|#pkgdatadir#|$(pkgdatadir)|" \
-e "s|#sysconfdir#|$(sysconfdir)/WindowMaker|" \
+ -e "s|#wpref#|$(wprefsdir)|" \
-e "s|#version#|$(VERSION)|" \
-e "s|#bindir#|$(bindir)|" \
-e "s|#LITE#|@LITE@|" \

View File

@ -0,0 +1,29 @@
$OpenBSD: patch-util_wmaker_inst_in,v 1.3 2001/09/07 14:11:28 wilfried Exp $
--- util/wmaker.inst.in.orig Mon Jul 23 19:35:15 2001
+++ util/wmaker.inst.in Fri Sep 7 15:33:58 2001
@@ -22,6 +22,7 @@ fi
# directory where system wide configuration is stored
GLOBALDIR="#pkgdatadir#"
GLOBALDEFDIR="#sysconfdir#"
+WPREFSDIR="#wpref#"
USERDIR=$HOME
@@ -77,14 +78,17 @@ copy() {
source=$GLOBALDIR/plmenu
fi
sed -e "s:#wmdatadir#:$GLOBALDIR:g" \
+ -e "s:#wprefsdir#:$WPREFSDIR:g" \
$source > $GSDIR/Defaults/WMRootMenu
else
if test "x$GNUSTEP_USER_ROOT" = "x"; then
sed -e "s:#wmdatadir#:$GLOBALDIR:g" \
+ -e "s:#wprefsdir#:$WPREFSDIR:g" \
$source > $target
else
sed -e "s|\$HOME/GNUstep|$GSDIR|g" \
-e "s:#wmdatadir#:$GLOBALDIR:g" \
+ -e "s:#wprefsdir#:$WPREFSDIR:g" \
$source > $target
fi
fi