From 95e3cf0bfcbe3f29acf1896d2b815ace8fa587e7 Mon Sep 17 00:00:00 2001 From: Greg Hudson Date: Fri, 20 Sep 1996 00:47:21 +0000 Subject: Some small gratuitous changes to work around a very obscure Solaris 2.4 make bug. --- zwgc/Imakefile | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'zwgc') diff --git a/zwgc/Imakefile b/zwgc/Imakefile index 47b2e22..21dca3a 100644 --- a/zwgc/Imakefile +++ b/zwgc/Imakefile @@ -12,17 +12,17 @@ TERMCAP = -ltermcap #endif #ifdef macII -LIBS2= -lc -lPW +OSLIBS = -lc -lPW #endif #ifdef SOLARIS -LIBS2 = -lgen +OSLIBS = -lgen #endif #ifdef __NetBSD__ OSDEFS=-DPOSIX_REGEXP #endif -LIBS = $(ZLIB) $(LIB_X) $(TERMCAP) $(LIBS2) $(OSLIBS) +LIBS = $(ZLIB) $(LIB_X) $(TERMCAP) $(OSLIBS) $(OSLIBS) SRCS = port_dictionary.c pointer_dictionary.c ulong_dictionary.c \ parser.y lexer.c node.c exec.c buffer.c main.c zephyr.c X_driver.c\ @@ -52,7 +52,7 @@ GENERATED= $(GENSRCS) \ port_dictionary.h pointer_dictionary.h ulong_dictionary.h \ char_stack.h string_stack.h xmode_stack.h \ y.tab.h - + XDEFS = -I./Memory -I./String -I./Dictionary -DREVSTACK \ -DDEFDESC=\"$(ZLIBDIR)/zwgc.desc\" \ -DAPPDEFDATABASE=\"$(ZLIBDIR)/zwgc_resources\" \ @@ -69,14 +69,6 @@ foreach_subdirs(depend,$(SUBDIRS)) zprogram(zwgc,$(LIBS)) install_man(zwgc.1,zwgc.1) -#ifdef ATHENA_COMPAT -/**/# On Athena, zwgc has been in /usr/etc on VAXes and RTs and some people -/**/# run in with a full pathname. For compatbility, make a link. -install:: - $(RM) $(DESTDIR)/usr/etc/zwgc - ln $(DESTDIR)$(CLIENTDIR)/zwgc $(DESTDIR)/usr/etc/zwgc || ln -s $(CLIENTDIR)/zwgc $(DESTDIR)/usr/etc/zwgc -#endif - install_file(zwgc.desc,$(ZLIBDIR)) install_file(zwgc_resources,$(ZLIBDIR)) install_file(zephyr.vars,$(ATHCONFDIR)) -- cgit v1.2.3