$NetBSD: patch-aa,v 1.2 2001/06/26 21:02:00 jlam Exp $ --- Makefile.orig Tue Jun 26 16:48:09 2001 +++ Makefile @@ -1,11 +1,11 @@ -CXX= /usr/bin/g++ -QTDIR = /usr/lib/qt2 -MOC = /usr/bin/moc -LIBS = -L$(QTDIR)/lib -L/usr/lib -L/usr/X11R6/lib -lqt -lX11 -CXXFLAGS = -g -I/usr/include -I$(QTDIR)/include -I/usr/X11R6/include +#CXX= /usr/bin/g++ +#QTDIR = /usr/lib/qt2 +MOC = $(QTDIR)/bin/moc +LIBS = ${LDFLAGS} -L$(QTDIR)/lib -L${X11BASE}/lib -lqt -lX11 -ljpeg +CXXFLAGS += -g -I$(QTDIR)/include -I${X11BASE}/include TARGET = bbkeysconf -PREFIX = /usr/local/bin +#PREFIX = /usr/local/bin OBJECTS = gui.o main.o myapplication.o SOURCES = gui.cc main.cc myapplication.cc MOCSRC = gui.hh @@ -37,13 +37,13 @@ if ! test -x $(TARGET) ; then \ exit; \ fi; \ - echo "Checking existance of $(PREFIX)...."; \ - if ! test -d $(PREFIX) ; then \ - echo "Heyyyyy. $(PREFIX) doesn't exist. Creating it...."; \ - /usr/bin/install -d $(PREFIX); \ + echo "Checking existance of $(PREFIX)/bin...."; \ + if ! test -d $(PREFIX)/bin ; then \ + echo "Heyyyyy. $(PREFIX)/bin doesn't exist. Creating it...."; \ + /usr/bin/install -d $(PREFIX)/bin; \ fi ; \ - echo "Installing $(TARGET) in $(PREFIX)..."; \ - /usr/bin/install -s $(TARGET) $(PREFIX)/$(TARGET) + echo "Installing $(TARGET) in $(PREFIX)/bin..."; \ + /usr/bin/install -s $(TARGET) $(PREFIX)/bin/$(TARGET) gui.o: gui.cc gui.moc main.o: main.cc