From 3f6ae395cee075f0e075830b597cb87ae3d5f77d Mon Sep 17 00:00:00 2001
From: Martin Dietze <herbert@spamcop.net>
Date: Mon, 24 Aug 2009 10:10:03 +0200
Subject: [PATCH] Add GLOBAL_DEFAULTS_SUBDIR and fix a syntax error in
 wmlib/Makefile.am

---
 src/defaults.c    | 12 ++++++++----
 src/main.c        |  6 +++++-
 src/wconfig.h.in  |  2 +-
 util/getstyle.c   |  6 +++++-
 util/wmsetbg.c    |  6 +++++-
 wmlib/Makefile.am |  4 ++--
 6 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/src/defaults.c b/src/defaults.c
index cd2ae25c..1dec523d 100644
--- a/src/defaults.c
+++ b/src/defaults.c
@@ -69,6 +69,10 @@
 
 #define MAX_SHORTCUT_LENGTH 32
 
+#ifndef GLOBAL_DEFAULTS_SUBDIR
+#define GLOBAL_DEFAULTS_SUBDIR "WindowMaker"
+#endif
+
 /***** Global *****/
 
 extern WDDomain *WDWindowMaker;
@@ -738,7 +742,7 @@ static WMPropList *readGlobalDomain(char *domainName, Bool requireDictionary)
 	char path[PATH_MAX];
 	struct stat stbuf;
 
-	snprintf(path, sizeof(path), "%s/WindowMaker/%s", SYSCONFDIR, domainName);
+	snprintf(path, sizeof(path), "%s/%s/%s", SYSCONFDIR, GLOBAL_DEFAULTS_SUBDIR, domainName);
 	if (stat(path, &stbuf) >= 0) {
 		globalDict = WMReadPropListFromFile(path);
 		if (globalDict && requireDictionary && !WMIsPLDictionary(globalDict)) {
@@ -833,7 +837,7 @@ void wDefaultsMergeGlobalMenus(WDDomain * menuDomain)
 		return;
 
 #ifdef GLOBAL_PREAMBLE_MENU_FILE
-	submenu = WMReadPropListFromFile(SYSCONFDIR "/WindowMaker/" GLOBAL_PREAMBLE_MENU_FILE);
+	submenu = WMReadPropListFromFile(SYSCONFDIR "/" GLOBAL_DEFAULTS_SUBDIR "/" GLOBAL_PREAMBLE_MENU_FILE);
 
 	if (submenu && !WMIsPLArray(submenu)) {
 		wwarning(_("invalid global menu file %s"), GLOBAL_PREAMBLE_MENU_FILE);
@@ -847,7 +851,7 @@ void wDefaultsMergeGlobalMenus(WDDomain * menuDomain)
 #endif
 
 #ifdef GLOBAL_EPILOGUE_MENU_FILE
-	submenu = WMReadPropListFromFile(SYSCONFDIR "/WindowMaker/" GLOBAL_EPILOGUE_MENU_FILE);
+	submenu = WMReadPropListFromFile(SYSCONFDIR "/" GLOBAL_DEFAULTS_SUBDIR "/" GLOBAL_EPILOGUE_MENU_FILE);
 
 	if (submenu && !WMIsPLArray(submenu)) {
 		wwarning(_("invalid global menu file %s"), GLOBAL_EPILOGUE_MENU_FILE);
@@ -934,7 +938,7 @@ WDDomain *wDefaultsInitDomain(char *domain, Bool requireDictionary)
 	}
 
 	/* global system dictionary */
-	snprintf(path, sizeof(path), "%s/WindowMaker/%s", SYSCONFDIR, domain);
+	snprintf(path, sizeof(path), "%s/%s/%s", SYSCONFDIR, GLOBAL_DEFAULTS_SUBDIR, domain);
 	if (stat(path, &stbuf) >= 0) {
 		shared_dict = WMReadPropListFromFile(path);
 		if (shared_dict) {
diff --git a/src/main.c b/src/main.c
index fb7228b3..2ad68f86 100644
--- a/src/main.c
+++ b/src/main.c
@@ -54,6 +54,10 @@
 
 #include <WINGs/WUtil.h>
 
+#ifndef GLOBAL_DEFAULTS_SUBDIR
+#define GLOBAL_DEFAULTS_SUBDIR "WindowMaker"
+#endif
+
 /****** Global Variables ******/
 
 /* general info */
@@ -610,7 +614,7 @@ static int real_main(int argc, char **argv)
 				printf("Window Maker %s\n", VERSION);
 				exit(0);
 			} else if (strcmp(argv[i], "--global_defaults_path") == 0) {
-				printf("%s/WindowMaker\n", SYSCONFDIR);
+			  printf("%s/%s\n", SYSCONFDIR, GLOBAL_DEFAULTS_SUBDIR);
 				exit(0);
 #ifdef DEBUG
 			} else if (strcmp(argv[i], "--synchronous") == 0) {
diff --git a/src/wconfig.h.in b/src/wconfig.h.in
index d299e51e..6992e0af 100644
--- a/src/wconfig.h.in
+++ b/src/wconfig.h.in
@@ -453,7 +453,7 @@
 
 #define HRESIZE_THRESHOLD	3
 
-#define MAX_WORKSPACENAME_WIDTH	32
+#define MAX_WORKSPACENAME_WIDTH	64
 #define MAX_WINDOWLIST_WIDTH	160     /* max width of window title in
                                          * window list */
 
diff --git a/util/getstyle.c b/util/getstyle.c
index 458c518d..87924ad9 100644
--- a/util/getstyle.c
+++ b/util/getstyle.c
@@ -38,6 +38,10 @@
 
 #include "../src/wconfig.h"
 
+#ifndef GLOBAL_DEFAULTS_SUBDIR
+#define GLOBAL_DEFAULTS_SUBDIR "WindowMaker"
+#endif
+
 /* table of style related options */
 static char *options[] = {
 	"TitleJustify",
@@ -133,7 +137,7 @@ char *globalDefaultsPathForDomain(char *domain)
 {
 	static char path[1024];
 
-	sprintf(path, "%s/WindowMaker/%s", SYSCONFDIR, domain);
+	sprintf(path, "%s/%s/%s", SYSCONFDIR, GLOBAL_DEFAULTS_SUBDIR, domain);
 
 	return path;
 }
diff --git a/util/wmsetbg.c b/util/wmsetbg.c
index 3f3bfea2..d5328bca 100644
--- a/util/wmsetbg.c
+++ b/util/wmsetbg.c
@@ -53,6 +53,10 @@
 
 #include "../src/wconfig.h"
 
+#ifndef GLOBAL_DEFAULTS_SUBDIR
+#define GLOBAL_DEFAULTS_SUBDIR "WindowMaker"
+#endif
+
 #include <WINGs/WINGs.h>
 #include <wraster.h>
 
@@ -1054,7 +1058,7 @@ char *globalDefaultsPathForDomain(char *domain)
 {
 	char path[1024];
 
-	sprintf(path, "%s/WindowMaker/%s", SYSCONFDIR, domain);
+	sprintf(path, "%s/%s/%s", SYSCONFDIR, GLOBAL_DEFAULTS_SUBDIR, domain);
 
 	return wstrdup(path);
 }
diff --git a/wmlib/Makefile.am b/wmlib/Makefile.am
index 9ad216fd..84005cdb 100644
--- a/wmlib/Makefile.am
+++ b/wmlib/Makefile.am
@@ -24,8 +24,8 @@ install-exec-local:
 	@$(mkinstalldirs) $(DESTDIR)$(libdir)/pkgconfig
 	@list='wmlib.pc'; for p in $$list; do \
 	  if test -f $$p; then \
-	    @echo "$(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/pkgconfig/"; \
-	    @$(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/pkgconfig/; \
+	    echo "$(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/pkgconfig/"; \
+	    $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/pkgconfig/; \
 	  else :; fi; \
 	done
 
-- 
2.11.4.GIT