$NetBSD: patch-aa,v 1.1.1.1 2007/06/20 18:09:24 tnn Exp $ --- Makefile.orig 2004-09-01 16:23:44.000000000 +0200 +++ Makefile @@ -13,12 +13,10 @@ INSTALLDIR = /usr/local/bin # Set the compilation flags and such CXX = g++ CDEFS = -D_REENTRANT -CPPFLAGS = -ggdb -Wall -#CPPFLAGS = -ggdb -Wall -O2 -INCLUDES = -I/usr/X11R6/include/X11 -I/usr/X11R6/include/X11/extensions -I./src -COMPILE = $(CXX) $(CDEFS) $(INCLUDES) $(CPPFLAGS) +INCLUDES = -I./src +COMPILE = $(CXX) $(CXXFLAGS) $(CDEFS) $(INCLUDES) $(CPPFLAGS) LINK = $(CXX) $(LDFLAGS) $(LDLIBS) -LDLIBS = -L/usr/X11R6/lib -lX11 -lXext +LDLIBS = -lX11 -lXext @@ -50,7 +48,7 @@ $(EXECUTABLE): $(OBJS) install: @echo "Installing obpager...." ;\ - install $(EXECUTABLE) $(INSTALLDIR) + install $(EXECUTABLE) $(PREFIX)/bin # For deps, copy gcc's dependency output to a ".d" file in the deps dir, then append additional deps to this file. @@ -89,7 +87,7 @@ $(OBJDIR)/%.o : %.cc mkdir $(DEPDIR) 2>/dev/null ; mkdir $(DEPDIR)/src 2>/dev/null ; \ $(COMPILE) -MMD -o $@ -c $< ; \ cp $(OBJDIR)/$*.d $(DEPDIR)/$*.d ; \ - sed -s -e 's/^[^:]\+: *//' -e 's/ *\\$$//' -e 's/^ *//' -e 's/ \+/ :\n/g' -e 's/$$/ :/' < $(OBJDIR)/$*.d >> $(DEPDIR)/$*.d ; \ + sed -e 's/^[^:]\+: *//' -e 's/ *\\$$//' -e 's/^ *//' -e 's/ \+/ :\n/g' -e 's/$$/ :/' < $(OBJDIR)/$*.d >> $(DEPDIR)/$*.d ; \ rm -f $(OBJDIR)/$*.d