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

@@ -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

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)
 
-EXTRA_DIST = $(prefsdata_DATA) mkMakefile
+nodist_prefsdata_DATA = $(GENERATED_MENUS)
 
+EXTRA_DIST = mkMakefile\
+	$(addsuffix .in, $(GENERATED_MENUS))
 
+CLEANFILES = $(GENERATED_MENUS)
+
+$(GENERATED_MENUS):
+	$(AM_V_GEN)sed -e "s:#wprefs#:$(wpexecbindir)/WPrefs:" \
+		$(srcdir)/$@.in > $@

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

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

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

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

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

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

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

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

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

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

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),

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),

WindowMaker/plmenu.fi.in

@@ -357,7 +357,7 @@
 		(
 		"Asetukset",
 		EXEC,
-		"/usr/local/GNUstep/Applications/WPrefs.app/WPrefs"
+		"#wprefs#"
 		)
 	),
 	(

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),

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),

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),

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"),

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),

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),

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),

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),