--- Makefile.orig	2007-10-29 12:02:54 UTC
+++ Makefile
@@ -4,10 +4,10 @@ LIBCDDB_LIBRARY = `pkg-config --libs lib
 TAGLIB_INCLUDE = `taglib-config --cflags`
 TAGLIB_LIBRARY = `taglib-config --libs`
 
-CPP = g++
+CPP = $(CXX)
 
-CPPFLAGS = -Wall $(TAGLIB_INCLUDE) $(LIBCDDB_INCLUDE) -c
-LDFLAGS = $(TAGLIB_LIBRARY) $(LIBCDDB_LIBRARY)
+CPPFLAGS = ${CXXFLAGS} -Wall $(TAGLIB_INCLUDE) $(LIBCDDB_INCLUDE) -c
+LDFLAGS+= $(TAGLIB_LIBRARY) $(LIBCDDB_LIBRARY)
 
 OBJ = cddb_query.o cddb_query_impl.o command_line.o main.o tag.o tracks.o
 EXE = taglookup
@@ -18,8 +18,8 @@ EXE = taglookup
 all: $(EXE)
 
 install: $(EXE)
-	$(INSTALL) -c -o root -g wheel -m 644 taglookup.1 $(PREFIX)/man/man1/taglookup.1
-	$(INSTALL) -c -o root -g wheel -m 755 $(EXE) $(PREFIX)/bin/taglookup
+	$(BSD_INSTALL_MAN) taglookup.1 $(DESTDIR)$(PREFIX)/man/man1/taglookup.1
+	$(BSD_INSTALL_PROGRAM) $(EXE) $(DESTDIR)$(PREFIX)/bin/taglookup
 
 $(EXE): $(OBJ)
 	$(CPP) $(LDFLAGS) $(OBJ) -o $(EXE)