diff options
Diffstat (limited to 'graphics/xpdf/files/patch-ab')
| -rw-r--r-- | graphics/xpdf/files/patch-ab | 62 |
1 files changed, 51 insertions, 11 deletions
diff --git a/graphics/xpdf/files/patch-ab b/graphics/xpdf/files/patch-ab index a993fa77a9c9..af6e93e9663f 100644 --- a/graphics/xpdf/files/patch-ab +++ b/graphics/xpdf/files/patch-ab @@ -1,24 +1,41 @@ -*** Makefile.config.orig Fri Nov 29 21:19:49 1996 ---- Makefile.config Fri Nov 29 21:23:24 1996 +*** Makefile.config.orig Fri May 30 03:29:08 1997 +--- Makefile.config Fri May 30 03:31:38 1997 *************** -*** 94,100 **** - #CFLAGS2 = -O2 -Wall +*** 44,50 **** + #------------------------------------------------------------------------ + + # Binaries and man pages will be installed here: +! PREFIX = /usr/local + + # SCO puts stuff here: + #PREFIX = /u +--- 44,50 ---- + #------------------------------------------------------------------------ + + # Binaries and man pages will be installed here: +! PREFIX ?= /usr/X11R6 + + # SCO puts stuff here: + #PREFIX = /u +*************** EXE = +*** 149,155 **** + #CFLAGS2 = -O2 -Wall -DNO_XPM # If you're using g++ 2.7.x, you'll want to use -Wno-unused: -! CFLAGS2 = -O2 -Wall -Wno-unused +! CFLAGS2 = -O2 -Wall -Wno-unused -DNO_XPM # For Linux/FreeBSD/NetBSD/BSDI systems using XFree86: #CFLAGS2 = -O2 -Wall -I/usr/X11R6/include -Wno-unused ---- 94,100 ---- - #CFLAGS2 = -O2 -Wall +--- 149,155 ---- + #CFLAGS2 = -O2 -Wall -DNO_XPM # If you're using g++ 2.7.x, you'll want to use -Wno-unused: -! CFLAGS2 = -O2 -Wall -Wno-unused -I${X11BASE}/include +! CFLAGS2 = -O2 -m486 -pipe -Wall -Wno-unused -I${X11BASE}/include # For Linux/FreeBSD/NetBSD/BSDI systems using XFree86: #CFLAGS2 = -O2 -Wall -I/usr/X11R6/include -Wno-unused -*************** -*** 127,139 **** +*************** CXXFLAGS2 = $(CFLAGS2) +*** 197,209 **** #------------------------------------------------------------------------ # For most systems, just grab the X library: @@ -32,7 +49,7 @@ # Some BSDI systems may need -lipc (?): #XLIBS = -L/usr/X11R6/lib -lX11 -lipc ---- 127,139 ---- +--- 197,209 ---- #------------------------------------------------------------------------ # For most systems, just grab the X library: @@ -46,3 +63,26 @@ # Some BSDI systems may need -lipc (?): #XLIBS = -L/usr/X11R6/lib -lX11 -lipc +*************** XLIBS = -lX11 +*** 242,251 **** + #------------------------------------------------------------------------ + + # This is needed for the color icon: +! #XPMLIB = -lXpm + + # Use this if you don't have libXpm (and also define NO_XPM in CFLAGS2): +! XPMLIB = + + #------------------------------------------------------------------------ + # C++ compilation rule. +--- 242,251 ---- + #------------------------------------------------------------------------ + + # This is needed for the color icon: +! XPMLIB = -lXpm + + # Use this if you don't have libXpm (and also define NO_XPM in CFLAGS2): +! #XPMLIB = + + #------------------------------------------------------------------------ + # C++ compilation rule. |