summaryrefslogtreecommitdiff
path: root/x11-fonts/xmbdfed/files/patch-aa
diff options
context:
space:
mode:
Diffstat (limited to 'x11-fonts/xmbdfed/files/patch-aa')
-rw-r--r--x11-fonts/xmbdfed/files/patch-aa45
1 files changed, 26 insertions, 19 deletions
diff --git a/x11-fonts/xmbdfed/files/patch-aa b/x11-fonts/xmbdfed/files/patch-aa
index 9466db23bb2f..e9743a3caa9c 100644
--- a/x11-fonts/xmbdfed/files/patch-aa
+++ b/x11-fonts/xmbdfed/files/patch-aa
@@ -1,9 +1,9 @@
-*** Makefile.orig Wed May 14 16:23:19 1997
---- Makefile Fri Jun 20 22:46:47 1997
+*** Makefile.orig Wed Nov 5 02:39:24 1997
+--- Makefile Sun Nov 9 10:32:13 1997
***************
*** 22,29 ****
#
- # $Id: Makefile,v 1.9 1997/05/14 21:23:14 mleisher Exp $
+ # $Id: Makefile,v 1.14 1997/10/27 01:48:16 mleisher Exp mleisher $
#
! CC = gcc
! CFLAGS = -g -Wall
@@ -12,7 +12,7 @@
--- 22,29 ----
#
- # $Id: Makefile,v 1.9 1997/05/14 21:23:14 mleisher Exp $
+ # $Id: Makefile,v 1.14 1997/10/27 01:48:16 mleisher Exp mleisher $
#
! #CC = gcc
! #CFLAGS = -g -Wall
@@ -20,39 +20,46 @@
OTHER = README COPYRIGHTS Makefile Imakefile.lesstif xmbdfedrc xmbdfed.man
***************
-*** 45,57 ****
+*** 55,61 ****
# files with a ".gz" extension. If you don't care about HBF fonts, just
# comment this line out.
#
! HBFDEFS = -Dunix -DIN_MEMORY -DGUNZIP_CMD="\"/usr/local/bin/gunzip -c\""
#
- # Uncomment these for SunOS.
- #
-! INCS = -I/usr/local/include/X11R5
-! LIBS = -L/usr/local/lib/X11R5 -lXm -lXmu -lXt -lX11
-
- #
- # Uncomment these for Solaris.
---- 45,57 ----
+ # Set the defines used for all files except the HBF support.
+--- 55,61 ----
# files with a ".gz" extension. If you don't care about HBF fonts, just
# comment this line out.
#
! HBFDEFS = -Dunix -DIN_MEMORY -DGUNZIP_CMD="\"/usr/bin/gunzip -c\""
#
+ # Set the defines used for all files except the HBF support.
+***************
+*** 65,72 ****
+ #
# Uncomment these for SunOS.
#
-! #INCS = -I/usr/local/include/X11R5
-! #LIBS = -L/usr/local/lib/X11R5 -lXm -lXmu -lXt -lX11
+! INCS = -I/usr/local/include/X11R5 $(FTYPE_INCS)
+! LIBS = -L/usr/local/lib/X11R5 -lXm -lXmu -lXt -lX11 $(FTYPE_LIBS)
+
+ #
+ # Uncomment these for Solaris.
+--- 65,72 ----
+ #
+ # Uncomment these for SunOS.
+ #
+! #INCS = -I/usr/local/include/X11R5 $(FTYPE_INCS)
+! #LIBS = -L/usr/local/lib/X11R5 -lXm -lXmu -lXt -lX11 $(FTYPE_LIBS)
#
# Uncomment these for Solaris.
***************
-*** 65,72 ****
---- 65,81 ----
- #INCS = -I/usr/X11/include -I/usr/Motif-2.0.1/include
- #LIBS = -L/usr/Motif-2.0.1/lib -lXm -L/usr/X11/lib -lXpm -lXmu -lXt -lX11 -lSM -lICE
+*** 80,87 ****
+--- 80,96 ----
+ #INCS = -I/usr/X11/include -I/usr/Motif-2.0.1/include $(FTYPE_INCS)
+ #LIBS = -L/usr/Motif-2.0.1/lib -lXm -L/usr/X11/lib -lXpm -lXmu -lXt -lX11 -lSM -lICE $(FTYPE_LIBS)
+ INCS = -I${X11BASE}/include
+ LIBS = -L${X11BASE}/lib ${MOTIFLIB} -lXpm -lXmu -lXt -lX11 -lSM -lICE -lXext