From c88df89e81c6acbfc5adc8c9314a9f43e8c5057d Mon Sep 17 00:00:00 2001 From: Toni Nikkanen Date: Sat, 7 Mar 2009 19:10:47 +0200 Subject: [PATCH] First running version, crashes --- Makefile | 2 +- erwise/Makefile | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 0b7e3a3..d81248c 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ # $Xorg: imake.c,v 1.6 2001/02/09 02:03:15 xorgcvs Exp $ # ---------------------------------------------------------------------- -# Makefile generated from "Imake.tmpl" and +# Makefile generated from "Imake.tmpl" and # $Xorg: Imake.tmpl,v 1.4 2000/08/17 19:41:46 cpqbld Exp $ # $XdotOrg: util/cf/Imake.tmpl,v 1.17 2006/04/15 15:55:25 herrb Exp $ # diff --git a/erwise/Makefile b/erwise/Makefile index 8c7702a..cd8df26 100644 --- a/erwise/Makefile +++ b/erwise/Makefile @@ -96,7 +96,7 @@ INSTDATFLAGS = -m 0444 INSTKMEMFLAGS = -g kmem -m 2755 - PROJECTROOT = /v/X11R5 + PROJECTROOT = /usr/X11R6 TOP_INCLUDES = -I$(INCROOT) @@ -135,9 +135,9 @@ # X Window System make variables; this need to be coordinated with rules PATHSEP = / - USRLIBDIR = /v/X11R5/lib - BINDIR = /v/X11R5/bin - INCROOT = /v/X11R5/include + USRLIBDIR = /usr/X11R6/lib + BINDIR = /usr/X11R6/bin + INCROOT = /usr/X11R6/include BUILDINCROOT = $(TOP) BUILDINCDIR = $(BUILDINCROOT)/X11 BUILDINCTOP = .. @@ -151,7 +151,7 @@ XINITDIR = $(LIBDIR)/xinit XDMDIR = $(LIBDIR)/xdm TWMDIR = $(LIBDIR)/twm - MANPATH = /v/X11R5/man + MANPATH = /usr/X11R6/man MANSOURCEPATH = $(MANPATH)/man MANSUFFIX = n LIBMANSUFFIX = 3 @@ -217,17 +217,17 @@ PICFLAGS = -fPIC DEPXLIB = $(DEPEXTENSIONLIB) XLIB = $(EXTENSIONLIB) -lX11 - DEPXMULIB = $(USRLIBDIR)/libXmu.sa.$(SOXMUREV) + DEPXMULIB = XMULIBONLY = -lXmu XMULIB = -lXmu DEPOLDXLIB = OLDXLIB = -loldX - DEPXTOOLLIB = $(USRLIBDIR)/libXt.sa.$(SOXTREV) + DEPXTOOLLIB = XTOOLLIB = -lXt - DEPXAWLIB = $(USRLIBDIR)/libXaw.sa.$(SOXAWREV) + DEPXAWLIB = XAWLIB = -lXaw DEPXILIB = -- 1.7.9.5