--- Makefile.orig	Sat Apr 21 20:12:15 2001
+++ Makefile		Sat Apr 21 20:15:23 2001
@@ -1,7 +1,7 @@
-CC = gcc
-LIBDIR = -L/usr/X11R6/lib
+CC ?= gcc
+LIBDIR = -L${X11BASE}/lib
 LIBS   = -lXpm -lXext -lX11 -lm
-FLAGS = -O2
+CFLAGS ?= -Wall -O2
 DESTDIR = /usr/local
 OBJS =	wmtz.o \
 		../wmgeneral/wmgeneral.o \
@@ -10,10 +10,10 @@
 
 
 .c.o:
-	$(CC) -I/usr/X11R6/include $(FLAGS) -c -Wall $< -o $*.o
+	$(CC) -I${X11BASE}/include $(CFLAGS) -c $< -o $*.o
 
 wmtz: $(OBJS)
-	$(CC) $(FLAGS) -o wmtz $^ -lXext $(LIBDIR) $(LIBS)
+	$(CC) $(CFLAGS) -o wmtz $^ -lXext $(LIBDIR) $(LIBS)
 
 all:: wmtz
 
@@ -25,22 +25,4 @@
 	rm -f *~
 
 install:: wmtz
-	cp -f wmtz $(DESTDIR)/bin/
-	chmod 755 $(DESTDIR)/bin/wmtz
-	chown root:root $(DESTDIR)/bin/wmtz
-	cp -f wmtz.1 $(DESTDIR)/man/man1
-	chmod 644 $(DESTDIR)/man/man1/wmtz.1
-	chown root:root $(DESTDIR)/man/man1/wmtz.1
-	cp -f wmtzrc $(HOME)/.wmtzrc
-	chmod 600 $(HOME)/.wmtzrc
-	cp -f wmtzrc /etc/wmtzrc
-	chmod 644 /etc/wmtzrc
-	chown root:root /etc/wmtzrc
-	@echo "wmtz: Installation finished..."
-
-uninstall:: 
-	rm -i /usr/local/bin/wmtz
-	rm -i /etc/wmtzrc
-	chmod 666 $(HOME)/.wmtzrc
-	rm -i $(HOME)/.wmtzrc
-	@echo "wmtz: Uninstall completed..."
+	@/usr/bin/install -c -o 0 -g 0 -s -m 755 wmtz ${X11BASE}/bin/wmtz