63fc151cb9
to ${X11BASE} in the header and library search paths into references to
${LOCALBASE}/share/x11-links. These packages should now be strongly-
buildlinked regardless of whether xpkgwedge is installed.
Changes well-tested on NetBSD-1.5X/i386 with and without xpkgwedge and
lightly-tested on NetBSD-1.5.1/alpha without xpkgwedge.
46 lines
1.2 KiB
Text
46 lines
1.2 KiB
Text
$NetBSD: patch-aa,v 1.6 2001/08/29 22:41:11 jlam Exp $
|
|
|
|
--- Makefile.orig Thu Feb 8 13:27:43 2001
|
|
+++ Makefile
|
|
@@ -1,8 +1,8 @@
|
|
DEBUG = #-g
|
|
-GLIBS = -L/usr/X11/lib \
|
|
+GLIBS = -L${BUILDLINK_X11_DIR}/lib \
|
|
-I$(QTDIR)/include -L$(QTDIR)/lib\
|
|
-lqt -lX11 -lXext
|
|
-INSTALL = /usr/games/
|
|
+INSTALL = ${PREFIX}/share
|
|
# obrazki w $(INSTALL)/images
|
|
#
|
|
#GLIBS= -L/mnt/sys2/xlib -lm -lX11 -lXext /usr/X11R6/lib/libqt.a \
|
|
@@ -11,17 +11,17 @@
|
|
# /usr/X11R6/lib/libkfm.la /usr/lib/libpng.a \
|
|
# /usr/lib/libjpeg.a
|
|
GINCLUDE = -I$(QTDIR)/include
|
|
-CFLAGS = -Wall -pipe -O2 -DINSTALL=\"$(INSTALL)/kulki_dir\"
|
|
+CFLAGS = -Wall -pipe -O2 -DINSTALL=\"$(INSTALL)/kulki\"
|
|
|
|
.SUFFIXES:
|
|
%moc.moc: %.h
|
|
- moc $< -o `basename $< .h`moc.moc
|
|
+ ${MOC} $< -o `basename $< .h`moc.moc
|
|
|
|
%.cc: %.moc
|
|
- cp `basename $< .moc`.moc `basename $< .moc`.cc
|
|
+ ${CP} `${BASENAME} $< .moc`.moc `${BASENAME} $< .moc`.cc
|
|
|
|
%.o: %.cc
|
|
- g++ $(CFLAGS) $(DEBUG) $(GINCLUDE) -c $<
|
|
+ ${CXX} ${CXXFLAGS} $(CFLAGS) $(DEBUG) $(GINCLUDE) -c $<
|
|
|
|
|
|
GOB = main.o main_window.o szcanvas.o szsprite.o hscor.o
|
|
@@ -30,7 +30,7 @@
|
|
all: gui kulki
|
|
|
|
kulki: gui
|
|
- g++ $(MOB) $(LOB) $(GLIBS) $(GOB) -o kulki && strip kulki
|
|
+ ${CXX} ${LDFLAGS} $(MOB) $(LOB) $(GLIBS) $(GOB) -o kulki
|
|
|
|
gui: $(MOB) $(GOB)
|
|
|