--- Makefile.orig	2008-05-14 11:13:02.000000000 +0800
+++ Makefile	2008-08-15 13:25:35.000000000 +0800
@@ -1,21 +1,21 @@
-UCCDIR = /usr/local/lib/ucc
-export UCCDIR
+UCCDIR = ${PREFIX}
+#export UCCDIR
 
 all:
-	make -C driver
-	make -C ucl
+	gmake -C driver
+	gmake -C ucl
 
 clean:
-	make -C driver clean
-	make -C ucl clean
+	gmake -C driver clean
+	gmake -C ucl clean
 	
 install:
-	mkdir -p $(UCCDIR)
-	cp driver/ucc $(UCCDIR)
-	cp ucl/ucl $(UCCDIR)
-	cp ucl/assert.o $(UCCDIR)
-	cp -r ucl/linux/include $(UCCDIR)
+	mkdir -p $(UCCDIR)/include/ucc
+	cp driver/ucc $(UCCDIR)/bin
+	cp ucl/ucl $(UCCDIR)/bin
+	cp ucl/assert.o $(UCCDIR)/lib
+	cp ucl/linux/include/* $(UCCDIR)/include/ucc/
 
 test:
-	make -C ucl test
+	gmake -C ucl test
 
