This is an automated email generated because a ref change occurred in the
git repository for project wmaker-crm.git.
The branch, next has been updated
via d48a37060c8ba29eb07e6301497068d2ed0dbddd (commit)
from 23417d99347ad60cc9535fa1d3244ed3ef7a1623 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit d48a37060c8ba29eb07e6301497068d2ed0dbddd
Author: Doug Torrance <dtorra...@piedmont.edu>
Date: Thu, 19 Jan 2017 18:24:30 -0500
URL: <http://repo.or.cz/wmaker-crm.git/d48a37060c8ba29e>
Use wprefs_bindir output variable to set WPrefs path in menus.
The path to WPrefs has been hardcoded in many of the menu files to
/usr/local/GNUstep/Applications/WPrefs.app/WPrefs, which would only actually
work if the user ran something like:
./configure --with-gnustepdir=/usr/local/GNUstep
during build.
Instead, we add a .in extension to all menu files with this issue and use
sed
to use the actual WPrefs path (given by the wprefs_bindir output variable)
and
generate a new menu file.
A very similar idea is already used to generate the WMState file, which sets
WPrefs as the command for the Window Maker logo tile in the dock.
This patch fixes Debian bug #851737:
https://bugs.debian.org/851737
---
.gitignore | 22 ++++++
WindowMaker/Makefile.am | 72 +++++++++++--------
WindowMaker/{menu.bg => menu.bg.in} | 2 +-
WindowMaker/{menu.fi => menu.fi.in} | 2 +-
WindowMaker/{menu.fy => menu.fy.in} | 2 +-
WindowMaker/{menu.hu => menu.hu.in} | 2 +-
WindowMaker/{menu => menu.in} | 2 +-
WindowMaker/{menu.ko => menu.ko.in} | 2 +-
WindowMaker/{menu.nl => menu.nl.in} | 2 +-
WindowMaker/{menu.ro => menu.ro.in} | 2 +-
WindowMaker/{menu.sk => menu.sk.in} | 2 +-
WindowMaker/{menu.zh_TW => menu.zh_TW.in} | 2 +-
WindowMaker/{plmenu.bg => plmenu.bg.in} | 2 +-
WindowMaker/{plmenu.es => plmenu.es.in} | 2 +-
WindowMaker/{plmenu.fi => plmenu.fi.in} | 2 +-
WindowMaker/{plmenu.fy => plmenu.fy.in} | 2 +-
WindowMaker/{plmenu => plmenu.in} | 2 +-
WindowMaker/{plmenu.ja => plmenu.ja.in} | 2 +-
WindowMaker/{plmenu.ko => plmenu.ko.in} | 2 +-
WindowMaker/{plmenu.nl => plmenu.nl.in} | 2 +-
WindowMaker/{plmenu.ro => plmenu.ro.in} | 2 +-
WindowMaker/{plmenu.sk => plmenu.sk.in} | 2 +-
WindowMaker/{plmenu.zh_TW => plmenu.zh_TW.in} | 2 +-
23 files changed, 87 insertions(+), 49 deletions(-)
rename WindowMaker/{menu.bg => menu.bg.in} (99%)
rename WindowMaker/{menu.fi => menu.fi.in} (99%)
rename WindowMaker/{menu.fy => menu.fy.in} (99%)
rename WindowMaker/{menu.hu => menu.hu.in} (99%)
rename WindowMaker/{menu => menu.in} (99%)
rename WindowMaker/{menu.ko => menu.ko.in} (99%)
rename WindowMaker/{menu.nl => menu.nl.in} (99%)
rename WindowMaker/{menu.ro => menu.ro.in} (99%)
rename WindowMaker/{menu.sk => menu.sk.in} (99%)
rename WindowMaker/{menu.zh_TW => menu.zh_TW.in} (98%)
rename WindowMaker/{plmenu.bg => plmenu.bg.in} (98%)
rename WindowMaker/{plmenu.es => plmenu.es.in} (98%)
rename WindowMaker/{plmenu.fi => plmenu.fi.in} (99%)
rename WindowMaker/{plmenu.fy => plmenu.fy.in} (98%)
rename WindowMaker/{plmenu => plmenu.in} (98%)
rename WindowMaker/{plmenu.ja => plmenu.ja.in} (98%)
rename WindowMaker/{plmenu.ko => plmenu.ko.in} (98%)
rename WindowMaker/{plmenu.nl => plmenu.nl.in} (98%)
rename WindowMaker/{plmenu.ro => plmenu.ro.in} (98%)
rename WindowMaker/{plmenu.sk => plmenu.sk.in} (98%)
rename WindowMaker/{plmenu.zh_TW => plmenu.zh_TW.in} (98%)
diff --git a/.gitignore b/.gitignore
index e50a2b774a34..f69db7333092 100644
--- a/.gitignore
+++ b/.gitignore
@@ -87,6 +87,28 @@ WINGs/WUtil.pc
wrlib/libwraster.map
+WindowMaker/menu
+WindowMaker/menu.bg
+WindowMaker/menu.fi
+WindowMaker/menu.fy
+WindowMaker/menu.hu
+WindowMaker/menu.ko
+WindowMaker/menu.nl
+WindowMaker/menu.ro
+WindowMaker/menu.sk
+WindowMaker/menu.zh_TW
+WindowMaker/plmenu
+WindowMaker/plmenu.bg
+WindowMaker/plmenu.es
+WindowMaker/plmenu.fi
+WindowMaker/plmenu.fy
+WindowMaker/plmenu.ja
+WindowMaker/plmenu.ko
+WindowMaker/plmenu.nl
+WindowMaker/plmenu.ro
+WindowMaker/plmenu.sk
+WindowMaker/plmenu.zh_TW
+
WindowMaker/Defaults/WMRootMenu
WindowMaker/Defaults/WMState
WindowMaker/Defaults/WMWindowAttributes
diff --git a/WindowMaker/Makefile.am b/WindowMaker/Makefile.am
index 133c797bd109..da4dc91e0191 100644
--- a/WindowMaker/Makefile.am
+++ b/WindowMaker/Makefile.am
@@ -1,64 +1,80 @@
-SUBDIRS = Backgrounds Defaults IconSets Icons Pixmaps Styles Themes
+SUBDIRS = Backgrounds . Defaults IconSets Icons Pixmaps Styles Themes
prefsdatadir = $(pkgdatadir)
-prefsdata_DATA =\
- appearance.menu\
- autostart.sh\
- background.menu\
- exitscript.sh\
+wpexecbindir = @wprefs_bindir@
+
+# menus which need generated to have correct path to WPrefs
+GENERATED_MENUS =\
menu\
menu.bg\
+ menu.fi\
+ menu.fy\
+ menu.hu\
+ menu.ko\
+ menu.nl\
+ menu.ro\
+ menu.sk\
+ menu.zh_TW\
+ plmenu\
+ plmenu.bg\
+ plmenu.es\
+ plmenu.fi\
+ plmenu.fy\
+ plmenu.ja\
+ plmenu.ko\
+ plmenu.nl\
+ plmenu.ro\
+ plmenu.sk\
+ plmenu.zh_TW
+
+# menus which do not mention WPrefs
+NONGENERATED_MENUS =\
menu.ca\
menu.cz\
menu.da\
menu.de\
menu.el\
menu.es\
- menu.fi\
menu.fr\
- menu.fy\
menu.gl\
menu.he\
menu.hr\
- menu.hu\
menu.it\
menu.ja\
- menu.ko\
- menu.nl\
menu.no\
menu.pl\
menu.pt\
- menu.ro\
menu.ru\
menu.se\
- menu.sk\
menu.sl\
menu.tr\
menu.zh_CN\
- menu.zh_TW\
- plmenu\
- plmenu.bg\
plmenu.da\
plmenu.de\
- plmenu.es\
- plmenu.fi\
plmenu.fr\
- plmenu.fy\
plmenu.hr\
plmenu.it\
- plmenu.ja\
- plmenu.ko\
- plmenu.nl\
plmenu.pl\
- plmenu.ro\
- plmenu.sk\
- plmenu.zh_CN\
- plmenu.zh_TW\
+ plmenu.zh_CN
+
+dist_prefsdata_DATA =\
+ appearance.menu\
+ autostart.sh\
+ background.menu\
+ exitscript.sh\
README\
README.themes\
- wmmacros
+ wmmacros\
+ $(NONGENERATED_MENUS)
+
+nodist_prefsdata_DATA = $(GENERATED_MENUS)
-EXTRA_DIST = $(prefsdata_DATA) mkMakefile
+EXTRA_DIST = mkMakefile\
+ $(addsuffix .in, $(GENERATED_MENUS))
+CLEANFILES = $(GENERATED_MENUS)
+$(GENERATED_MENUS):
+ $(AM_V_GEN)sed -e "s:#wprefs#:$(wpexecbindir)/WPrefs:" \
+ $(srcdir)/$@.in > $@
diff --git a/WindowMaker/menu.bg b/WindowMaker/menu.bg.in
similarity index 99%
rename from WindowMaker/menu.bg
rename to WindowMaker/menu.bg.in
index 53f83af9fba0..1bbe8b218cbf 100644
--- a/WindowMaker/menu.bg
+++ b/WindowMaker/menu.bg.in
@@ -209,7 +209,7 @@
"Фон" END
"Запази темата" SHEXEC getstyle -t
$HOME/GNUstep/Library/WindowMaker/Themes/"%a(Theme name,Enter file name:)"
"Запази колекцията иконки" SHEXEC geticonset
$HOME/GNUstep/Library/WindowMaker/IconSets/"%a(IconSet name,Enter file name:)"
- "Пособие за настройки" EXEC
/usr/local/GNUstep/Applications/WPrefs.app/WPrefs
+ "Пособие за настройки" EXEC #wprefs#
"Изглед" END
"Изход" MENU
diff --git a/WindowMaker/menu.fi b/WindowMaker/menu.fi.in
similarity index 99%
rename from WindowMaker/menu.fi
rename to WindowMaker/menu.fi.in
index bd682b574137..86a2a25a37b1 100644
--- a/WindowMaker/menu.fi
+++ b/WindowMaker/menu.fi.in
@@ -202,7 +202,7 @@
"Taustat" END
"Tallenna teema" SHEXEC getstyle -t
$HOME/GNUstep/Library/WindowMaker/Themes/"%a(Teeman nimi,Kirjoita
teematiedoston nimi:)"
"Tallenna kuvakkeet" SHEXEC geticonset
$HOME/GNUstep/Library/WindowMaker/IconSets/"%a(Kuvakesetin nimi,Kirjoita
tiedostonnimi:)"
- "Asetukset" EXEC
/usr/local/GNUstep/Applications/WPrefs.app/WPrefs
+ "Asetukset" EXEC #wprefs#
"Ulkonäkö" END
"Lopeta" MENU
diff --git a/WindowMaker/menu.fy b/WindowMaker/menu.fy.in
similarity index 99%
rename from WindowMaker/menu.fy
rename to WindowMaker/menu.fy.in
index 9a67f56c7f81..c2b63f84ef28 100644
--- a/WindowMaker/menu.fy
+++ b/WindowMaker/menu.fy.in
@@ -208,7 +208,7 @@
"Eftergrûn" END
"Tema bewarje" SHEXEC getstyle -t
$HOME/GNUstep/Library/WindowMaker/Themes/"%a(Temanamme,Fier bestânsnamme yn:)"
"Ikoaneset bewarje" SHEXEC geticonset
$HOME/GNUstep/Library/WindowMaker/IconSets/"%a(Ikoanesetnamme,Fier bestânsnamme
yn:)"
- "Foarkarrehelpmiddel" EXEC
/usr/local/GNUstep/Applications/WPrefs.app/WPrefs
+ "Foarkarrehelpmiddel" EXEC #wprefs#
"Uterlik" END
"Sesje" MENU
diff --git a/WindowMaker/menu.hu b/WindowMaker/menu.hu.in
similarity index 99%
rename from WindowMaker/menu.hu
rename to WindowMaker/menu.hu.in
index 37f4ce4d5320..619c03b81ff5 100644
--- a/WindowMaker/menu.hu
+++ b/WindowMaker/menu.hu.in
@@ -204,7 +204,7 @@
"Háttér" END
"Téma mentése" SHEXEC getstyle -t
$HOME/GNUstep/Library/WindowMaker/Themes/"%a(Téma neve,Add meg a téma fájl
nevét:)"
"Ikonbeállítások mentése" SHEXEC geticonset
$HOME/GNUstep/Library/WindowMaker/IconSets/"%a(Ikonbeállítások mentése,Add meg
a fájl nevét:)"
- "Konfiguráló program" EXEC /usr/bin/WPrefs
+ "Konfiguráló program" EXEC #wprefs#
"Megjelenés" END
"Kilépés" MENU
diff --git a/WindowMaker/menu b/WindowMaker/menu.in
similarity index 99%
rename from WindowMaker/menu
rename to WindowMaker/menu.in
index 7491f8d02451..bebab5f2f681 100644
--- a/WindowMaker/menu
+++ b/WindowMaker/menu.in
@@ -208,7 +208,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/Applications/WPrefs.app/WPrefs
+ "Preferences Utility" EXEC #wprefs#
"Appearance" END
"Session" MENU
diff --git a/WindowMaker/menu.ko b/WindowMaker/menu.ko.in
similarity index 99%
rename from WindowMaker/menu.ko
rename to WindowMaker/menu.ko.in
index 8d4d0b892847..6b4132233d98 100644
--- a/WindowMaker/menu.ko
+++ b/WindowMaker/menu.ko.in
@@ -163,7 +163,7 @@
"세션 지움" CLEAR_SESSION
"창 관 리" END
"작업환경" MENU
- "설 정" SHEXEC
/usr/local/GNUstep/Applications/WPrefs.app/WPrefs || wmakerconf
+ "설 정" SHEXEC #wprefs# || wmakerconf
"테 마" OPEN_MENU -noext THEMES_DIR
~/GNUstep/Library/WindowMaker/Themes WITH setstyle
"테마저장" EXEC getstyle -t
$HOME/GNUstep/Library/WindowMaker/Themes/"%a(테마 이름,파일 이름을 입력하세요:)"
"아이콘셋" OPEN_MENU -noext ICON_SETS_DIR
~/GNUstep/Library/WindowMaker/IconSets WITH seticons
diff --git a/WindowMaker/menu.nl b/WindowMaker/menu.nl.in
similarity index 99%
rename from WindowMaker/menu.nl
rename to WindowMaker/menu.nl.in
index ba97611b9208..e07d32c2d517 100644
--- a/WindowMaker/menu.nl
+++ b/WindowMaker/menu.nl.in
@@ -208,7 +208,7 @@
"Achtergrond" END
"Thema opslaan" SHEXEC getstyle -t
$HOME/GNUstep/Library/WindowMaker/Themes/"%a(Themanaam,Voer bestandsnaam in:)"
"Iconenset opslaan" SHEXEC geticonset
$HOME/GNUstep/Library/WindowMaker/IconSets/"%a(Iconensetnaam,Voer bestandsnaam
in:)"
- "Voorkeurenhulpmiddel" EXEC
/usr/local/GNUstep/Applications/WPrefs.app/WPrefs
+ "Voorkeurenhulpmiddel" EXEC #wprefs#
"Uiterlijk" END
"Sessie" MENU
diff --git a/WindowMaker/menu.ro b/WindowMaker/menu.ro.in
similarity index 99%
rename from WindowMaker/menu.ro
rename to WindowMaker/menu.ro.in
index 7026e233fe20..6f5d056e32d3 100644
--- a/WindowMaker/menu.ro
+++ b/WindowMaker/menu.ro.in
@@ -202,7 +202,7 @@
"Fundal" END
"Salvează Tema" SHEXEC getstyle -t
$HOME/GNUstep/Library/WindowMaker/Themes/"%a(Theme name,Enter file name:)"
"Salvează Setul de Iconiţe" SHEXEC geticonset
$HOME/GNUstep/Library/WindowMaker/IconSets/"%a(IconSet name,Enter file name:)"
- "Utilitar de Configurare" EXEC
/usr/local/GNUstep/Applications/WPrefs.app/WPrefs
+ "Utilitar de Configurare" EXEC #wprefs#
"Configurare" END
"Ieşire" MENU
diff --git a/WindowMaker/menu.sk b/WindowMaker/menu.sk.in
similarity index 99%
rename from WindowMaker/menu.sk
rename to WindowMaker/menu.sk.in
index 42b95201136f..a6e992d02e66 100644
--- a/WindowMaker/menu.sk
+++ b/WindowMaker/menu.sk.in
@@ -216,7 +216,7 @@
"Pozadie" END
"Uložiť tému" SHEXEC getstyle -t
$HOME/GNUstep/Library/WindowMaker/Themes/"%a(Meno témy,Zadajte názov súboru:)"
"Uložiť sadu ikon" SHEXEC geticonset
$HOME/GNUstep/Library/WindowMaker/IconSets/"%a(Meno sady ikon,Zadajte názov
súboru:)"
- "Konfiguračný nástroj" EXEC
/usr/local/GNUstep/Applications/WPrefs.app/WPrefs
+ "Konfiguračný nástroj" EXEC #wprefs#
"Vzhľad" END
"Koniec" MENU
diff --git a/WindowMaker/menu.zh_TW b/WindowMaker/menu.zh_TW.in
similarity index 98%
rename from WindowMaker/menu.zh_TW
rename to WindowMaker/menu.zh_TW.in
index cd78998b7bdb..6f40a92d8e4f 100644
--- a/WindowMaker/menu.zh_TW
+++ b/WindowMaker/menu.zh_TW.in
@@ -199,7 +199,7 @@
"背景" END
"儲存主題" SHEXEC getstyle -t
$HOME/GNUstep/Library/WindowMaker/Themes/"%a(主題名稱)"
"儲存圖示集" SHEXEC geticonset
$HOME/GNUstep/Library/WindowMaker/IconSets/"%a(圖示集名稱)"
- "偏好設定公用程式" EXEC
/usr/local/GNUstep/Applications/WPrefs.app/WPrefs
+ "偏好設定公用程式" EXEC #wprefs#
"外觀" END
"離開" MENU
diff --git a/WindowMaker/plmenu.bg b/WindowMaker/plmenu.bg.in
similarity index 98%
rename from WindowMaker/plmenu.bg
rename to WindowMaker/plmenu.bg.in
index dd35be6800de..b99fc596b7e8 100644
--- a/WindowMaker/plmenu.bg
+++ b/WindowMaker/plmenu.bg.in
@@ -94,7 +94,7 @@
),
("Запази темата", SHEXEC, "getstyle -t
$HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""),
("Запази колекцията иконки", SHEXEC, "geticonset
$HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""),
- ("Пособие за настройки", EXEC,
"/usr/local/GNUstep/Applications/WPrefs.app/WPrefs")
+ ("Пособие за настройки", EXEC, "#wprefs#")
),
("Изход",
("Рестартиране", RESTART),
diff --git a/WindowMaker/plmenu.es b/WindowMaker/plmenu.es.in
similarity index 98%
rename from WindowMaker/plmenu.es
rename to WindowMaker/plmenu.es.in
index b1cadc3fc985..560a993ebf28 100644
--- a/WindowMaker/plmenu.es
+++ b/WindowMaker/plmenu.es.in
@@ -94,7 +94,7 @@
),
("Guardar tema", SHEXEC, "getstyle -t
$HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""),
("Guardar iconos", SHEXEC, "geticonset
$HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""),
- ("Preferencias", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs")
+ ("Preferencias", EXEC, "#wprefs#")
),
("Salir",
("Reiniciar", RESTART),
diff --git a/WindowMaker/plmenu.fi b/WindowMaker/plmenu.fi.in
similarity index 99%
rename from WindowMaker/plmenu.fi
rename to WindowMaker/plmenu.fi.in
index 931f77d9418c..2752ccee25cb 100644
--- a/WindowMaker/plmenu.fi
+++ b/WindowMaker/plmenu.fi.in
@@ -357,7 +357,7 @@
(
"Asetukset",
EXEC,
- "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs"
+ "#wprefs#"
)
),
(
diff --git a/WindowMaker/plmenu.fy b/WindowMaker/plmenu.fy.in
similarity index 98%
rename from WindowMaker/plmenu.fy
rename to WindowMaker/plmenu.fy.in
index c7a6f316e823..bfc7296adae5 100644
--- a/WindowMaker/plmenu.fy
+++ b/WindowMaker/plmenu.fy.in
@@ -93,7 +93,7 @@
),
("Tema bewarje", SHEXEC, "getstyle -t
$HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Temanamme)\""),
("Ikoaneset bewarje", SHEXEC, "geticonset
$HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(Ikoanesetnamme)\""),
- ("Foarkarrehelpmiddel", EXEC,
"/usr/local/GNUstep/Applications/WPrefs.app/WPrefs")
+ ("Foarkarrehelpmiddel", EXEC, "#wprefs#")
),
("Sesje",
("Sesje bewarje", SAVE_SESSION),
diff --git a/WindowMaker/plmenu b/WindowMaker/plmenu.in
similarity index 98%
rename from WindowMaker/plmenu
rename to WindowMaker/plmenu.in
index 020c239acb37..f2d692fdcd31 100644
--- a/WindowMaker/plmenu
+++ b/WindowMaker/plmenu.in
@@ -93,7 +93,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/Applications/WPrefs.app/WPrefs")
+ ("Preferences Utility", EXEC, "#wprefs#")
),
("Session",
("Save Session", SAVE_SESSION),
diff --git a/WindowMaker/plmenu.ja b/WindowMaker/plmenu.ja.in
similarity index 98%
rename from WindowMaker/plmenu.ja
rename to WindowMaker/plmenu.ja.in
index 0bf413f1dcac..0fb4c83ccc7a 100644
--- a/WindowMaker/plmenu.ja
+++ b/WindowMaker/plmenu.ja.in
@@ -94,7 +94,7 @@
),
("設定をテーマとしてセーブ", SHEXEC, "getstyle -t
$HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""),
("現在のアイコンセットをセーブ", SHEXEC, "geticonset
$HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""),
- ("設定ユーティリティ", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs")
+ ("設定ユーティリティ", EXEC, "#wprefs#")
),
("終了",
("再起動", RESTART),
diff --git a/WindowMaker/plmenu.ko b/WindowMaker/plmenu.ko.in
similarity index 98%
rename from WindowMaker/plmenu.ko
rename to WindowMaker/plmenu.ko.in
index 5fad39ffeeab..131929a7df74 100644
--- a/WindowMaker/plmenu.ko
+++ b/WindowMaker/plmenu.ko.in
@@ -63,7 +63,7 @@
),
("작업공간", WORKSPACE_MENU),
("작업환경",
- ("설 정", SHEXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs ||
wmakerconf"),
+ ("설 정", SHEXEC, "#wprefs# || wmakerconf"),
("테 마", OPEN_MENU, "-noext /usr/share/WindowMaker/Themes
~/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
("테마저장", EXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(테마
이름,파일 이름을 입력하세요:)\""),
("스 타 일", OPEN_MENU, "-noext /usr/share/WindowMaker/Styles
~/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
diff --git a/WindowMaker/plmenu.nl b/WindowMaker/plmenu.nl.in
similarity index 98%
rename from WindowMaker/plmenu.nl
rename to WindowMaker/plmenu.nl.in
index 138f925a63af..a19b448d59e3 100644
--- a/WindowMaker/plmenu.nl
+++ b/WindowMaker/plmenu.nl.in
@@ -93,7 +93,7 @@
),
("Thema opslaan", SHEXEC, "getstyle -t
$HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Themanaam)\""),
("Iconenset opslaan", SHEXEC, "geticonset
$HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(Iconensetnaam)\""),
- ("Voorkeurenhulpmiddel", EXEC,
"/usr/local/GNUstep/Applications/WPrefs.app/WPrefs")
+ ("Voorkeurenhulpmiddel", EXEC, "#wprefs#")
),
("Sessie",
("Sessie opslaan", SAVE_SESSION),
diff --git a/WindowMaker/plmenu.ro b/WindowMaker/plmenu.ro.in
similarity index 98%
rename from WindowMaker/plmenu.ro
rename to WindowMaker/plmenu.ro.in
index 35d7a657e41a..744f157d4f37 100644
--- a/WindowMaker/plmenu.ro
+++ b/WindowMaker/plmenu.ro.in
@@ -94,7 +94,7 @@
),
("Salvează Tema", SHEXEC, "getstyle -t
$HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""),
("Salvează Setul de Iconiţe", SHEXEC, "geticonset
$HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""),
- ("Utilitar de Configurare", EXEC,
"/usr/local/GNUstep/Applications/WPrefs.app/WPrefs")
+ ("Utilitar de Configurare", EXEC, "#wprefs#")
),
("Ieşire",
("Repornire", RESTART),
diff --git a/WindowMaker/plmenu.sk b/WindowMaker/plmenu.sk.in
similarity index 98%
rename from WindowMaker/plmenu.sk
rename to WindowMaker/plmenu.sk.in
index 0174f7162f7f..bddf4c362151 100644
--- a/WindowMaker/plmenu.sk
+++ b/WindowMaker/plmenu.sk.in
@@ -94,7 +94,7 @@
),
("Uložiť tému", SHEXEC, "getstyle -t
$HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""),
("Uložiť sadu ikon", SHEXEC, "geticonset
$HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""),
- ("Konfiguračný nástroj", EXEC,
"/usr/local/GNUstep/Applications/WPrefs.app/WPrefs")
+ ("Konfiguračný nástroj", EXEC, "#wprefs#")
),
("Koniec",
("Reštartovať", RESTART),
diff --git a/WindowMaker/plmenu.zh_TW b/WindowMaker/plmenu.zh_TW.in
similarity index 98%
rename from WindowMaker/plmenu.zh_TW
rename to WindowMaker/plmenu.zh_TW.in
index 5b2cf25b8b21..0a7a3eddbc59 100644
--- a/WindowMaker/plmenu.zh_TW
+++ b/WindowMaker/plmenu.zh_TW.in
@@ -92,7 +92,7 @@
),
("儲存主題", SHEXEC, "getstyle -t
$HOME/GNUstep/Library/WindowMaker/Themes/%a(主題名稱)"),
("儲存圖示集", SHEXEC, "geticonset
$HOME/GNUstep/Library/WindowMaker/IconSets/%a(圖示集名稱)"),
- ("偏好設定公用程式", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs")
+ ("偏好設定公用程式", EXEC, "#wprefs#")
),
("離開",
("重新啟動", RESTART),
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 22 ++++++
WindowMaker/Makefile.am | 72 +++++++++++--------
WindowMaker/{menu.bg => menu.bg.in} | 2 +-
WindowMaker/{menu.fi => menu.fi.in} | 2 +-
WindowMaker/{menu.fy => menu.fy.in} | 2 +-
WindowMaker/{menu.hu => menu.hu.in} | 2 +-
WindowMaker/{menu => menu.in} | 2 +-
WindowMaker/{menu.ko => menu.ko.in} | 2 +-
WindowMaker/{menu.nl => menu.nl.in} | 2 +-
WindowMaker/{menu.ro => menu.ro.in} | 2 +-
WindowMaker/{menu.sk => menu.sk.in} | 2 +-
WindowMaker/{menu.zh_TW => menu.zh_TW.in} | 2 +-
WindowMaker/{plmenu.bg => plmenu.bg.in} | 2 +-
WindowMaker/{plmenu.es => plmenu.es.in} | 2 +-
WindowMaker/{plmenu.fi => plmenu.fi.in} | 2 +-
WindowMaker/{plmenu.fy => plmenu.fy.in} | 2 +-
WindowMaker/{plmenu => plmenu.in} | 2 +-
WindowMaker/{plmenu.ja => plmenu.ja.in} | 2 +-
WindowMaker/{plmenu.ko => plmenu.ko.in} | 2 +-
WindowMaker/{plmenu.nl => plmenu.nl.in} | 2 +-
WindowMaker/{plmenu.ro => plmenu.ro.in} | 2 +-
WindowMaker/{plmenu.sk => plmenu.sk.in} | 2 +-
WindowMaker/{plmenu.zh_TW => plmenu.zh_TW.in} | 2 +-
23 files changed, 87 insertions(+), 49 deletions(-)
rename WindowMaker/{menu.bg => menu.bg.in} (99%)
rename WindowMaker/{menu.fi => menu.fi.in} (99%)
rename WindowMaker/{menu.fy => menu.fy.in} (99%)
rename WindowMaker/{menu.hu => menu.hu.in} (99%)
rename WindowMaker/{menu => menu.in} (99%)
rename WindowMaker/{menu.ko => menu.ko.in} (99%)
rename WindowMaker/{menu.nl => menu.nl.in} (99%)
rename WindowMaker/{menu.ro => menu.ro.in} (99%)
rename WindowMaker/{menu.sk => menu.sk.in} (99%)
rename WindowMaker/{menu.zh_TW => menu.zh_TW.in} (98%)
rename WindowMaker/{plmenu.bg => plmenu.bg.in} (98%)
rename WindowMaker/{plmenu.es => plmenu.es.in} (98%)
rename WindowMaker/{plmenu.fi => plmenu.fi.in} (99%)
rename WindowMaker/{plmenu.fy => plmenu.fy.in} (98%)
rename WindowMaker/{plmenu => plmenu.in} (98%)
rename WindowMaker/{plmenu.ja => plmenu.ja.in} (98%)
rename WindowMaker/{plmenu.ko => plmenu.ko.in} (98%)
rename WindowMaker/{plmenu.nl => plmenu.nl.in} (98%)
rename WindowMaker/{plmenu.ro => plmenu.ro.in} (98%)
rename WindowMaker/{plmenu.sk => plmenu.sk.in} (98%)
rename WindowMaker/{plmenu.zh_TW => plmenu.zh_TW.in} (98%)
repo.or.cz automatic notification. Contact project admin crma...@gmail.com
if you want to unsubscribe, or site admin ad...@repo.or.cz if you receive
no reply.
--
wmaker-crm.git ("The Window Maker window manager")
--
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
