--- clxclient-3.6.1.orig/Makefile	2008-05-10 12:00:47.000000000 -0700
+++ clxclient-3.6.1/Makefile	2008-05-10 12:01:26.000000000 -0700
@@ -17,9 +17,9 @@
 
 # Modify as required.
 #
-PREFIX = /usr/local
+PREFIX = ${DESTDIR}/usr
 SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
-LIBDIR = lib$(SUFFIX)
+LIBDIR = lib
 
 
 MAJVERS = 3
@@ -43,12 +43,12 @@
 
 
 $(CLXCLIENT_MIN): $(CLXCLIENT_O)
-	g++ -shared $(LDFLAGS) -Wl,-soname,$(CLXCLIENT_MAJ) -o $(CLXCLIENT_MIN) $(CLXCLIENT_O) $(CLXCLIENT_DEP)
+	${CXX} -shared $(LDFLAGS) -Wl,-soname,$(CLXCLIENT_MAJ) -o $(CLXCLIENT_MIN) $(CLXCLIENT_O) $(CLXCLIENT_DEP)
 
 
 install:	$(CLXCLIENT_MIN)
 	/usr/bin/install -d $(PREFIX)/$(LIBDIR)
-	/usr/bin/install -m 644 $(CLXCLIENT_H) $(PREFIX)/include
+	/usr/bin/install -D -m 644 $(CLXCLIENT_H) $(PREFIX)/include/$(CLXCLIENT_H)
 	/usr/bin/install -m 755 $(CLXCLIENT_MIN) $(PREFIX)/$(LIBDIR)
 	/sbin/ldconfig -n $(PREFIX)/$(LIBDIR)
 	ln -sf $(CLXCLIENT_MIN) $(PREFIX)/$(LIBDIR)/$(CLXCLIENT_SO)