diff options
| author |  Greg Hudson <ghudson@mit.edu> | 1998-04-30 16:03:27 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 1998-04-30 16:03:27 +0000 |
| commit | a701cc52490ea0f22d26934b35788748f7140818 (patch) | |
| tree | 8fbec5984a19b9f9ad2cfe414ef8212ea1ebe7bd /clients | |
| parent | 638169228f2da7a11a727f190fc98250296faecc (diff) | |
Move files from datadir back to datadir/zephyr.
Diffstat (limited to 'clients')
| -rw-r--r-- | clients/xzwrite/Makefile.in | 4 | ||||
| -rw-r--r-- | clients/xzwrite/XZwrite.in | 2 | ||||
| -rw-r--r-- | clients/xzwrite/interface.c | 7 |
3 files changed, 7 insertions, 6 deletions
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 |