devel/x3270 x3270-3.3-modularX.patch,NONE,1.1
Karsten Hopp (karsten)
fedora-extras-commits at redhat.com
Wed Nov 23 14:19:06 UTC 2005
Author: karsten
Update of /cvs/extras/devel/x3270
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26119
Added Files:
x3270-3.3-modularX.patch
Log Message:
temporary patch until imake/gccmakedep is fixed
x3270-3.3-modularX.patch:
--- NEW FILE x3270-3.3-modularX.patch ---
--- x3270-3.3/Makefile.rh1 2005-11-23 13:50:08.000000000 +0100
+++ x3270-3.3/Makefile 2005-11-23 13:53:31.000000000 +0100
@@ -134,15 +134,15 @@
IMAKESRC = $(CONFIGSRC)/imake
DEPENDSRC = $(CONFIGSRC)/util
- INCROOT = /usr/X11R6/include
- USRLIBDIR = /usr/X11R6/lib
+ INCROOT = /usr/include
+ USRLIBDIR = /usr/lib
VARDIR = /var
VARLIBDIR = $(VARDIR)/lib
SYSTEMUSRLIBDIR = /usr/lib
SYSTEMUSRINCDIR = /usr/include
- SHLIBDIR = /usr/X11R6/lib
+ SHLIBDIR = /usr/lib
LINTLIBDIR = $(USRLIBDIR)/lint
- MANPATH = /usr/X11R6/man
+ MANPATH = /usr/share/man
MANSOURCEPATH = $(MANPATH)/man
MANDIR = $(MANSOURCEPATH)1
LIBMANDIR = $(MANSOURCEPATH)3
@@ -291,7 +291,7 @@
INSTDATFLAGS = -m 0444
INSTKMEMFLAGS = -m 4711
- PROJECTROOT = /usr/X11R6
+ PROJECTROOT = /usr
CDEBUGFLAGS = -O2 -fno-strength-reduce -fno-strict-aliasing
CCOPTIONS =
@@ -362,7 +362,7 @@
# X Window System make variables; these need to be coordinated with rules
XTOP = $(TOP)
- BINDIR = /usr/X11R6/bin
+ BINDIR = /usr/bin
BUILDINCROOT = $(TOP)/exports
BUILDINCDIR = $(BUILDINCROOT)/include
BUILDINCTOP = ../..
@@ -379,13 +379,13 @@
XBUILDBINDIR = $(XBUILDINCROOT)/bin
INCDIR = $(INCROOT)
ADMDIR = /usr/adm
- LIBDIR = /usr/X11R6/lib/X11
- LIBEXECDIR = /usr/X11R6/libexec
+ LIBDIR = /usr/lib/X11
+ LIBEXECDIR = /usr/libexec
MODULEDIR = $(USRLIBDIR)/modules
TOP_X_INCLUDES =
XBINDIR = $(PROJECTROOT)/bin
- INSTSRCDIR = /usr/X11R6/src
+ INSTSRCDIR = /usr/src
ETCX11DIR = /etc/X11
@@ -1051,7 +1051,7 @@
LIBX3270DIR = /usr/lib/x3270
EXTRA_LDOPTIONS =
EXTRA_LIBRARIES = -lssl -lcrypto -lnsl -lutil
- EXTRA_INCLUDES =
+ EXTRA_INCLUDES = -I/usr/share
CC = gcc
INSTALL = /usr/bin/install -c
More information about the scm-commits
mailing list