diff options
| author | zuntum <zuntum@pkgsrc.org> | 2001-06-24 01:30:39 +0000 |
|---|---|---|
| committer | zuntum <zuntum@pkgsrc.org> | 2001-06-24 01:30:39 +0000 |
| commit | 80e2ea9aff1175fe746807988fa83f9703156886 (patch) | |
| tree | be300b0ddd712402bc536ce5daa949527ca6557e /games | |
| parent | 3b198e82c0efed21cdb84b68b63080a52238d020 (diff) | |
| download | pkgsrc-80e2ea9aff1175fe746807988fa83f9703156886.tar.gz | |
o set USE_X11 so X11BASE gets added to LDFLAGS -- simplifies patch-aa
Diffstat (limited to 'games')
| -rw-r--r-- | games/kulki/Makefile | 3 | ||||
| -rw-r--r-- | games/kulki/patches/patch-aa | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/games/kulki/Makefile b/games/kulki/Makefile index 69e37b7be8b..cd9be2212bf 100644 --- a/games/kulki/Makefile +++ b/games/kulki/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/03/24 19:51:40 zuntum Exp $ +# $NetBSD: Makefile,v 1.4 2001/06/24 01:30:39 zuntum Exp $ # DISTNAME= kulki-1.01 @@ -14,6 +14,7 @@ DEPENDS+= qt2>=2.2.3:../../x11/qt2 WRKSRC= ${WRKDIR}/kulki +USE_X11= YES USE_GMAKE= YES MAKE_ENV= QTDIR="${X11BASE}/qt2" MOC="${QTDIR}/bin/moc" CXX="${CXX}" CP="${CP}" diff --git a/games/kulki/patches/patch-aa b/games/kulki/patches/patch-aa index 009068c8b5e..76695153a8a 100644 --- a/games/kulki/patches/patch-aa +++ b/games/kulki/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.2 2001/03/12 22:33:48 zuntum Exp $ +$NetBSD: patch-aa,v 1.3 2001/06/24 01:30:39 zuntum Exp $ --- Makefile.orig Thu Feb 8 19:27:43 2001 +++ Makefile @@ -8,7 +8,7 @@ $NetBSD: patch-aa,v 1.2 2001/03/12 22:33:48 zuntum Exp $ - -I$(QTDIR)/include -L$(QTDIR)/lib\ - -lqt -lX11 -lXext -INSTALL = /usr/games/ -+LIBS = -L$(X11BASE)/lib -Wl,-R$(X11BASE)/lib -L$(X11BASE)/qt2/lib -Wl,-R$(X11BASE)/qt2/lib \ ++LIBS = -L$(X11BASE)/qt2/lib -Wl,-R$(X11BASE)/qt2/lib \ + -I$(X11BASE)/qt2/include -L$(LOCALBASE)/lib -Wl,-R$(LOCALBASE)/lib -I$(LOCALBASE)/include \ + -lqt -lX11 -lXext # obrazki w $(INSTALL)/images @@ -32,7 +32,7 @@ $NetBSD: patch-aa,v 1.2 2001/03/12 22:33:48 zuntum Exp $ %.o: %.cc - g++ $(CFLAGS) $(DEBUG) $(GINCLUDE) -c $< -+ $(CXX) $(CXXFLAGS) -DINSTALL=\"$(PREFIX)/share/kulki\" -L$(X11BASE)/lib -L$(X11BASE)/qt2/lib -I$(X11BASE)/include \ ++ $(CXX) $(CXXFLAGS) -DINSTALL=\"$(PREFIX)/share/kulki\" -L$(X11BASE)/lib -L$(X11BASE)/qt2/lib \ + -I$(X11BASE)/qt2/include -c $< @@ -42,7 +42,7 @@ $NetBSD: patch-aa,v 1.2 2001/03/12 22:33:48 zuntum Exp $ kulki: gui - g++ $(MOB) $(LOB) $(GLIBS) $(GOB) -o kulki && strip kulki -+ $(CXX) $(MOB) $(LOB) $(LIBS) $(GOB) -o kulki ++ $(CXX) $(MOB) $(LOB) $(LIBS) $(LDFLAGS) $(GOB) -o kulki gui: $(MOB) $(GOB) |