From a701cc52490ea0f22d26934b35788748f7140818 Mon Sep 17 00:00:00 2001
From: Greg Hudson <ghudson@mit.edu>
Date: Thu, 30 Apr 1998 16:03:27 +0000
Subject: Move files from datadir back to datadir/zephyr.

---
 zwgc/Makefile.in | 4 ++--
 zwgc/X_driver.c  | 2 +-
 zwgc/main.c      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'zwgc')

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);
-- 
cgit v1.2.3