Clean up. Use ${X11BASE}, ${MOTIFLIB}, XawClientLibs, xmkmf -a,

correctly reference compressed man pages, and define REQUIRES_MOTIF.

3 files changed, 4 insertions, 4 deletions

diff --git a/www/ashe/files/patch-aa b/www/ashe/files/patch-aa
index e686cba..adcc005 100644
--- a/www/ashe/files/patch-aa
+++ b/www/ashe/files/patch-aa
@@ -13,7 +13,7 @@
   all: $(LIBTARGET)
 --- 1,5 ----
   LIBTARGET = libhtmlw.a
-! CFLAGS+=-I/usr/X11R6/include -DMOTIF1_2
+! CFLAGS+=-I${X11BASE}/include -DMOTIF1_2
   RANLIB=ranlib
   
   all: $(LIBTARGET)
diff --git a/www/ashe/files/patch-ac b/www/ashe/files/patch-ac
index 6515ce3..72be72b 100644
--- a/www/ashe/files/patch-ac
+++ b/www/ashe/files/patch-ac
@@ -52,7 +52,7 @@
   
 - 
 - #EXTRA_LIBRARIES =  -lcci -lhtmlw -lXm -lXt -lXext -lX11
-  EXTRA_LIBRARIES =  -lcci -lhtmlw -lXm -lXaw -lXmu -lXt -lXext -lX11
+- EXTRA_LIBRARIES =  -lcci -lhtmlw -lXm -lXaw -lXmu -lXt -lXext -lX11
   
 ! #
 ! # This is what is built when you say 'make all'
@@ -79,7 +79,7 @@
    */
 ! INCLUDES = -I../libhtmlw-src -I../libcci
   
-  EXTRA_LIBRARIES =  -lcci -lhtmlw -lXm -lXaw -lXmu -lXt -lXext -lX11
++ EXTRA_LIBRARIES =  -lcci -lhtmlw ${MOTIFLIB} XawClientLibs
   
 ! ComplexProgramTarget(xhtml)
 ! InstallNonExecFile(help.html,$(LIBDIR)/xhtml)
diff --git a/www/ashe/files/patch-ad b/www/ashe/files/patch-ad
index 9ef846b..1fadd0c 100644
--- a/www/ashe/files/patch-ad
+++ b/www/ashe/files/patch-ad
@@ -11,4 +11,4 @@
   
   ! Very Important : Change this directory to the directory of help.html
   
-! xhtml*htmldir: /usr/X11R6/lib/X11/xhtml
+! xhtml*htmldir: ${X11BASE}/lib/X11/xhtml