[840] in Zephyr_Bugs
zephyr 2.0.4 xzwrite can't find it's icon.
daemon@ATHENA.MIT.EDU (Salvatore Valente)
Fri Jan 17 18:31:49 1997
Date: Fri, 17 Jan 1997 18:30:44 -0500
To: zephyr-bugs@MIT.EDU
From: Salvatore Valente <svalente@dimins.com>
Hi.
The zephyr 2.0.4 configure script creates XZwrite from XZwrite.in.
The line
*icon.bitmap: @datadir@/xzwrite.bitmap
gets changed to
*icon.bitmap: ${prefix}/share/xzwrite.bitmap
App-defaults files should not have shell variables in them. Here is a
patch so that the configure script doesn't try to create XZwrite.
Instead, the xzwrite Makefile creates it with the appropriate variable
substitutions.
-Sal.
diff -cr z/clients/xzwrite/Makefile.in zephyr-2.0.4/clients/xzwrite/Makefile.in
*** z/clients/xzwrite/Makefile.in Fri Jan 17 17:28:58 1997
--- zephyr-2.0.4/clients/xzwrite/Makefile.in Fri Jan 17 17:25:19 1997
***************
*** 17,22 ****
--- 17,23 ----
VPATH=@srcdir@
CC=@CC@
INSTALL=@INSTALL@
+ at=@
DEBUG=-O
CFLAGS=$(DEBUG) -DDATADIR=\"$(datadir)\" -I$(top_srcdir)/h -I$(BUILDTOP)/h \
***************
*** 30,40 ****
dest_window.o xzwrite.o edit_window.o zephyr.o GetString.o Popup.o \
yank.o menu_window.o logins.o
! all: xzwrite
xzwrite: $(OBJS) $(BUILDTOP)/lib/zephyr/libzephyr.a \
$(BUILDTOP)/lib/dyn/libdyn.a @ETDEP@
$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
check:
--- 31,45 ----
dest_window.o xzwrite.o edit_window.o zephyr.o GetString.o Popup.o \
yank.o menu_window.o logins.o
! all: xzwrite XZwrite
xzwrite: $(OBJS) $(BUILDTOP)/lib/zephyr/libzephyr.a \
$(BUILDTOP)/lib/dyn/libdyn.a @ETDEP@
$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+
+ XZwrite: XZwrite.in
+ -@rm -f XZwrite
+ sed -e 's,$(at)datadir$(at),$(datadir),' < XZwrite.in > XZwrite
check:
diff -cr z/configure.in zephyr-2.0.4/configure.in
*** z/configure.in Fri Jan 17 17:28:41 1997
--- zephyr-2.0.4/configure.in Fri Jan 17 17:16:34 1997
***************
*** 178,182 ****
clients/zstat/Makefile clients/zwgc/Makefile clients/zwrite/Makefile
lib/Makefile lib/dyn/Makefile lib/et/Makefile lib/ss/Makefile
lib/zephyr/Makefile server/Makefile zhm/Makefile
! clients/xzwrite/XZwrite clients/zwgc/zephyr.vars)
--- 178,182 ----
clients/zstat/Makefile clients/zwgc/Makefile clients/zwrite/Makefile
lib/Makefile lib/dyn/Makefile lib/et/Makefile lib/ss/Makefile
lib/zephyr/Makefile server/Makefile zhm/Makefile
! clients/zwgc/zephyr.vars)
