diff options
| author | Will Andrews <will@FreeBSD.org> | 2000-04-07 01:34:34 +0000 |
|---|---|---|
| committer | Will Andrews <will@FreeBSD.org> | 2000-04-07 01:34:34 +0000 |
| commit | 1f3f8daeb93ccc331a3ff660657a603077bc6e87 (patch) | |
| tree | cd5eb8e8be27eb42969c5c6caf6e204c866a524c /devel/tmake | |
| parent | Assume maintainership (diff) | |
Smack tmake into allowing environment-override C(C,XX) as well as
C(XX)FLAGS. Also make it look in the right directory for Qt includes.
This commit is required for me to update twinlib.
Diffstat (limited to 'devel/tmake')
| -rw-r--r-- | devel/tmake/files/patch-aa | 17 | ||||
| -rw-r--r-- | devel/tmake/files/patch-ab | 11 |
2 files changed, 28 insertions, 0 deletions
diff --git a/devel/tmake/files/patch-aa b/devel/tmake/files/patch-aa new file mode 100644 index 000000000000..aa4a6a439a8a --- /dev/null +++ b/devel/tmake/files/patch-aa @@ -0,0 +1,17 @@ +--- lib/unix/generic.t Fri Jul 30 08:55:18 1999 ++++ lib/unix/generic.t.new Thu Apr 6 20:43:17 2000 +@@ -150,10 +150,10 @@ + + ####### Compiler, tools and options + +-CC = #$ Expand("TMAKE_CC"); +-CXX = #$ Expand("TMAKE_CXX"); +-CFLAGS = #$ Expand("TMAKE_CFLAGS"); ExpandGlue("DEFINES","-D"," -D",""); +-CXXFLAGS= #$ Expand("TMAKE_CXXFLAGS"); ExpandGlue("DEFINES","-D"," -D",""); ++CC ?= #$ Expand("TMAKE_CC"); ++CXX ?= #$ Expand("TMAKE_CXX"); ++CFLAGS ?= #$ Expand("TMAKE_CFLAGS"); ExpandGlue("DEFINES","-D"," -D",""); ++CXXFLAGS?= #$ Expand("TMAKE_CXXFLAGS"); ExpandGlue("DEFINES","-D"," -D",""); + INCPATH = #$ ExpandPath("INCPATH","-I"," -I",""); + #$ Config("staticlib") && DisableOutput(); + LINK = #$ Expand("TMAKE_LINK"); diff --git a/devel/tmake/files/patch-ab b/devel/tmake/files/patch-ab new file mode 100644 index 000000000000..71581b3d3f24 --- /dev/null +++ b/devel/tmake/files/patch-ab @@ -0,0 +1,11 @@ +--- lib/freebsd-g++/tmake.conf Wed Jul 28 11:21:38 1999 ++++ lib/freebsd-g++/tmake.conf.new Thu Apr 6 20:56:26 2000 +@@ -29,7 +29,7 @@ + TMAKE_LIBDIR = + TMAKE_INCDIR_X11 = /usr/X11R6/include + TMAKE_LIBDIR_X11 = /usr/X11R6/lib +-TMAKE_INCDIR_QT = $(QTDIR)/include ++TMAKE_INCDIR_QT = $(QTDIR)/include/X11/qt + TMAKE_LIBDIR_QT = $(QTDIR)/lib + TMAKE_INCDIR_OPENGL = /usr/X11R6/include + TMAKE_LIBDIR_OPENGL = /usr/X11R6/lib |