Move files from datadir back to datadir/zephyr.

7 files changed, 12 insertions, 10 deletions

diff --git a/Makefile.in b/Makefile.in
index 283aa7d..4f45baa 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -30,6 +30,7 @@ install:
 	${ENSUREDIR} ${DESTDIR}${bindir} 755
 	${ENSUREDIR} ${DESTDIR}${libdir} 755
 	${ENSUREDIR} ${DESTDIR}${datadir} 755
+	${ENSUREDIR} ${DESTDIR}${datadir}/zephyr 755
 	${ENSUREDIR} ${DESTDIR}${sysconfdir} 755
 	${ENSUREDIR} ${DESTDIR}${sysconfdir}/acl 755
 	${ENSUREDIR} ${DESTDIR}${sbindir} 755
diff --git a/clients/xzwrite/Makefile.in b/clients/xzwrite/Makefile.in
index 01a3ab4..4722787 100644
--- a/clients/xzwrite/Makefile.in
+++ b/clients/xzwrite/Makefile.in
@@ -49,8 +49,8 @@ check:
 install: xzwrite XZwrite
 	${INSTALL} -m 755 -s xzwrite ${DESTDIR}${bindir}
 	${INSTALL} -m 644 ${srcdir}/xzwrite.1 ${DESTDIR}${mandir}/man1
-	${INSTALL} -m 644 XZwrite ${DESTDIR}${datadir}
-	${INSTALL} -m 644 ${srcdir}/xzwrite.bitmap ${DESTDIR}${datadir}
+	${INSTALL} -m 644 XZwrite ${DESTDIR}${datadir}/zephyr
+	${INSTALL} -m 644 ${srcdir}/xzwrite.bitmap ${DESTDIR}${datadir}/zephyr
 
 clean:
 	rm -f ${OBJS} xzwrite
diff --git a/clients/xzwrite/XZwrite.in b/clients/xzwrite/XZwrite.in
index f7b21c8..691cc1c 100644
--- a/clients/xzwrite/XZwrite.in
+++ b/clients/xzwrite/XZwrite.in
@@ -17,7 +17,7 @@
 *readAnyone:		on
 *readXzwrite:		on
 
-*icon.bitmap:		@datadir@/xzwrite.bitmap
+*icon.bitmap:		@datadir@/zephyr/xzwrite.bitmap
 *icon.translations:	#override\
 	<BtnDown>:	set() \n\
 	<Btn1Up>:	OpenSend() unset() \n\
diff --git a/clients/xzwrite/interface.c b/clients/xzwrite/interface.c
index d48e73c..716e0e3 100644
--- a/clients/xzwrite/interface.c
+++ b/clients/xzwrite/interface.c
@@ -137,13 +137,14 @@ void build_interface(argc, argv)
 #ifdef HAVE_PUTENV
 				  strlen("XFILESEARCHPATH=") +
 #endif
-				  strlen(DATADIR) + 5);
+				  strlen(DATADIR) + 12);
 	  if (path2 != NULL) {
 #ifdef HAVE_PUTENV
-	       sprintf(path2, "XFILESEARCHPATH=%s:%s/%%N", path1, DATADIR);
+	       sprintf(path2, "XFILESEARCHPATH=%s:%s/zephyr/%%N", path1,
+		       DATADIR);
 	       putenv(path2);
 #else
-	       sprintf(path2, "%s:%s/%N", path1, DATADIR);
+	       sprintf(path2, "%s:%s/zephyr/%%N", path1, DATADIR);
 	       setenv("XFILESEARCHPATH", path2, 1);
 	       free(path2);
 #endif
diff --git a/zwgc/Makefile.in b/zwgc/Makefile.in
index a78597c..e754c9d 100644
--- a/zwgc/Makefile.in
+++ b/zwgc/Makefile.in
@@ -85,8 +85,8 @@ check:
 install: zwgc
 	${INSTALL} -m 755 -s zwgc ${DESTDIR}${bindir}
 	${INSTALL} -m 644 ${srcdir}/zwgc.1 ${DESTDIR}${mandir}/man1
-	${INSTALL} -m 644 ${srcdir}/zwgc.desc ${DESTDIR}${datadir}
-	${INSTALL} -m 644 ${srcdir}/zwgc_resources ${DESTDIR}${datadir}
+	${INSTALL} -m 644 ${srcdir}/zwgc.desc ${DESTDIR}${datadir}/zephyr
+	${INSTALL} -m 644 ${srcdir}/zwgc_resources ${DESTDIR}${datadir}/zephyr
 
 clean:
 	rm -f ${OBJS} zwgc port_dictionary.[ch] pointer_dictionary.[ch]
diff --git a/zwgc/X_driver.c b/zwgc/X_driver.c
index ba118b7..7284920 100644
--- a/zwgc/X_driver.c
+++ b/zwgc/X_driver.c
@@ -265,7 +265,7 @@ int open_display_and_load_resources(pargc, argv)
       return(1);
 
     /* Read in our application-specific resources: */
-    sprintf(dbasename, "%s/zwgc_resources", DATADIR);
+    sprintf(dbasename, "%s/zephyr/zwgc_resources", DATADIR);
     temp_db1 = XrmGetFileDatabase(dbasename);
 
     /*
diff --git a/zwgc/main.c b/zwgc/main.c
index 0733a23..4a50952 100644
--- a/zwgc/main.c
+++ b/zwgc/main.c
@@ -120,7 +120,7 @@ static void read_in_description_file()
 
 /*    var_clear_all_variables(); <<<>>> */
 
-    sprintf(defdesc, "%s/%s", DATADIR, DEFDESC);
+    sprintf(defdesc, "%s/zephyr/%s", DATADIR, DEFDESC);
     input_file = locate_file(description_filename_override, USRDESC, defdesc);
     if (input_file)
       program = parse_file(input_file);