diff --git a/wmMatrix/Makefile b/wmMatrix/Makefile
index 4a3ec76..0d90559 100644
--- a/wmMatrix/Makefile
+++ b/wmMatrix/Makefile
@@ -1,31 +1,21 @@
 CC     = gcc
 CFLAGS = -O2 -Wall 
-INCDIR = -I/usr/X11R6/include/X11 -I/usr/X11R6/include
-DESTDIR= /usr/X11R6
-LIBDIR = -L/usr/X11R6/lib
-
-# for Linux
+INCDIR = 
+DESTDIR= /usr
+LIBDIR = 
 LIBS   = -lXpm -lX11 -lXext
 
-# for Solaris
-#LIBS   = -lXpm  -lX11 -lXext -lsocket -lnsl
-
-
 OBJS   = wmMatrix.o matrix.o xutils.o yarandom.o
 
-
-
-
 .c.o:
 	$(CC) $(CFLAGS) -D$(shell echo `uname -s`) -c $< -o $*.o $(INCDIR)
 
+all:	wmMatrix
 
-all:	wmMatrix.o wmMatrix 
+wmMatrix.o:	wmMatrix_master.xpm wmMatrix_mask.xbm
 
-wmMatrix.o: wmMatrix_master.xpm wmMatrix_mask.xbm
 wmMatrix:	$(OBJS) 
-	$(CC) $(COPTS) $(SYSTEM) -o wmMatrix $^ $(INCDIR) $(LIBDIR) $(LIBS)
-
+	$(CC) $(LDFLAGS) -o wmMatrix $^ $(LIBDIR) $(LIBS)
 
 clean:
 	for i in $(OBJS) ; do \
@@ -33,6 +23,6 @@ clean:
 	done
 	rm -f wmMatrix
 
-install:: wmMatrix
-	install -c -s -m 0755 wmMatrix $(DESTDIR)/bin
-
+install:	wmMatrix
+	install -m 0755 wmMatrix $(DESTDIR)/bin
+	install -m 0644 wmMatrix.1 $(DESTDIR)/share/man/man1