07c67df8fd
components. This allows users of Qt to specify QTDIR=/path/to/qt instead of having to patch all configure scripts and makefiles to look for alternate names. This is the recommended approach from Troll Tech (Qt authors). update pkgs which use qt1 to reflect this.
41 lines
950 B
Text
41 lines
950 B
Text
$NetBSD: patch-ab,v 1.2 2000/03/28 00:09:20 dmcmahill Exp $
|
|
|
|
--- src/Makefile.in.orig Fri Feb 26 12:02:22 1999
|
|
+++ src/Makefile.in Sun Mar 26 09:45:44 2000
|
|
@@ -15,5 +15,5 @@
|
|
####### Compiler, tools and options
|
|
|
|
-CXX = $(SYSCONF_CXX)
|
|
+CXX = $(SYSCONF_CXX_LIB)
|
|
CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS_X11) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
|
|
LFLAGS = $(SYSCONF_LFLAGS_X11) $(SYSCONF_LFLAGS)
|
|
@@ -24,5 +24,5 @@
|
|
|
|
TARGET = qt
|
|
-DESTDIR = ../lib/
|
|
+DESTDIR =
|
|
VER_MAJ = 1
|
|
VER_MIN = 44
|
|
@@ -506,20 +506,8 @@
|
|
####### Implicit rules
|
|
|
|
-.SUFFIXES: .cpp .cxx .cc .C .c
|
|
+.SUFFIXES: .cpp
|
|
|
|
.cpp.o:
|
|
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
|
|
-
|
|
-.cxx.o:
|
|
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
|
|
-
|
|
-.cc.o:
|
|
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
|
|
-
|
|
-.C.o:
|
|
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
|
|
-
|
|
-.c.o:
|
|
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
|
|
+ @cd `dirname $@` && $(CXX) -c $(CXXFLAGS) `basename $<`
|
|
|
|
####### Build rules
|