$NetBSD: patch-aa,v 1.7 2002/09/20 21:19:27 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${X11BASE}/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)