Index: kproject/Makefile diff -u kproject/Makefile:1.1.1.1 kproject/Makefile:1.1.3.1 --- kproject/Makefile:1.1.1.1 Sun Sep 26 00:37:04 1999 +++ kproject/Makefile Sun Sep 26 04:57:01 1999 @@ -20,5 +20,12 @@ USE_QT= yes WRKSRC= ${WRKDIR}/kproject +MAKE_ENV= QTDIR="${QTDIR}" + +.if defined(PREFIX) +QTDIR?= ${PREFIX} +.else +QTDIR?= ${X11BASE} +.endif .include Index: kproject/patches/patch-aa diff -u kproject/patches/patch-aa:1.1.1.1 kproject/patches/patch-aa:1.1.3.1 --- kproject/patches/patch-aa:1.1.1.1 Sun Sep 26 00:37:05 1999 +++ kproject/patches/patch-aa Sun Sep 26 04:57:02 1999 @@ -5,7 +5,7 @@ -kde_libraries = /opt/kde/lib -qt_libraries = /usr/lib +kde_libraries = ${LOCALBASE}/lib -+qt_libraries = ${X11BASE}/lib ++qt_libraries = ${QTDIR}/lib top_builddir = .. -LIBTOOL = $(SHELL) $(top_builddir)/libtool +LIBTOOL = libtool @@ -14,11 +14,11 @@ ############ Autoconf-generated variables ################### -CXXFLAGS= -O2 -Wall -I/opt/kde/include -I/usr/lib/qt/include -I.. -LDFLAGS = -s -L/opt/kde/lib -L/usr/lib -L/usr/X11/lib -lkdecore -lkdeui -lqt -lXext -lX11 -+CXXFLAGS= -O2 -Wall -I$(LOCALBASE)/include -I$(X11BASE)/include -I$(X11BASE)/include/X11/qt -I.. -+LDFLAGS = -s -L$(kde_libraries) -L$(qt_libraries) -lkdecore -lkdeui -lqt -lXext -lX11 ++CXXFLAGS= -O2 -Wall -I$(LOCALBASE)/include -I$(X11BASE)/include -I$(PREFIX)/include -I$(QTDIR)/include/X11/qt -I.. ++LDFLAGS = -s -L$(kde_libraries) -L$(qt_libraries) -L$(X11BASE)/lib -lkdecore -lkdeui -lqt -lXext -lX11 CXX = c++ -MOC = /usr/bin/moc -+MOC = $(X11BASE)/bin/moc ++MOC = $(QTDIR)/bin/moc install = /usr/bin/install -c -INSTALL = $(install) -m 0755 @@ -28,7 +28,7 @@ INSTALL_DIR_PRIVATE = $(install) -d -m 0700 -prefix = /opt/kde -+prefix = /usr/local ++prefix = $(PREFIX) KDEINC = $(prefix)/include BINDIR = $(prefix)/bin LIBDIR = $(prefix)/lib