--- Makefile.orig	1998-10-27 00:14:26 UTC
+++ Makefile
@@ -1,6 +1,6 @@
-BINDIR = /usr/local/bin
-CDDIR  = /usr/local/lib/xcd
-MANDIR = /usr/local/man/man1
+BINDIR ?= /usr/local/bin
+CDDIR  ?= /usr/local/lib/xcd
+MANDIR ?= /usr/local/man/man1
 
 all: cdplayer xcd
 xcd:	xcd.in
@@ -8,20 +8,20 @@ xcd:	xcd.in
 		< xcd.in > $@
 	chmod ugo+x xcd
 cdplayer: cdplayer.cc
-	$(CC) $(CFLAGS) -o $@ cdplayer.cc -lm
+	$(CXX) $(CFLAGS) -o $@ cdplayer.cc -lm
 
 install: xcd cdplayer
-	mkdir -p $(BINDIR)
-	mkdir -p $(MANDIR)
-	mkdir -p $(CDDIR)
-	install -c -s cdplayer $(CDDIR)
-	install -c xcd $(BINDIR)
-	install -c xcd.1 $(MANDIR)
+	mkdir -p ${DESTDIR}$(BINDIR)
+	mkdir -p ${DESTDIR}$(MANDIR)
+	mkdir -p ${DESTDIR}$(CDDIR)
+	install -c -s cdplayer ${DESTDIR}$(CDDIR)
+	install -c xcd ${DESTDIR}$(BINDIR)
+	install -c xcd.1 ${DESTDIR}$(MANDIR)
 	for f in bitmaps/*.xbm ; do \
-		install -c $$f $(CDDIR); \
+		install -c $$f ${DESTDIR}$(CDDIR); \
 	done
 
 install.prog: xcd cdplayer
-	mkdir -p $(BINDIR)
-	install -c -s cdplayer $(CDDIR)
-	install -c xcd $(BINDIR)
+	mkdir -p ${DESTDIR}$(BINDIR)
+	install -c -s cdplayer ${DESTDIR}$(CDDIR)
+	install -c xcd ${DESTDIR}$(BINDIR)