--- Makefile	2007-04-01 07:05:25.000000000 -0400
+++ Makefile	2007-04-01 20:27:01.000000000 -0400
@@ -2,36 +2,37 @@
 export OutFile = $(UPPOUT)ide/GCC-Gcc-Gui-Linux-Main-Shared/ide
 
 
+.PHONY: all
+all:	theide install
+
 .PHONY: theide
 theide: 
-	$(MAKE) -f uppsrc/ide/Makefile	
-	
-.PHONY: all
-all:	theide install clean
+	$(MAKE) -f uppsrc/ide/Makefile
 
 .PHONY: install
 install:
-#	mkdir -p $(DESTDIR)/usr/bin
-#	mkdir -p $(DESTDIR)/usr/share/applications
-#	mkdir -p $(DESTDIR)/usr/share/pixmaps
-#	mkdir -p $(DESTDIR)/usr/share/upp
-
-	install -D $(OutFile) $(DESTDIR)/usr/bin/theide
-	install -D uppsrc/ide/theide.desktop $(DESTDIR)/usr/share/applications/theide.desktop
-	install -D uppsrc/ide/theide-48.png $(DESTDIR)/usr/share/pixmaps/theide.png
-
-	cp -r Common $(DESTDIR)/usr/share/upp
-#	install -D -d Common $(DESTDIR)/usr/share/upp/Common
-	cp -r uppsrc $(DESTDIR)/usr/share/upp
-#	install -D -d uppsrc $(DESTDIR)/usr/share/upp/uppsrc
-	cp -r examples $(DESTDIR)/usr/share/upp
-#	install -D -d examples $(DESTDIR)/usr/share/upp/examples
-	cp -r reference $(DESTDIR)/usr/share/upp
-#	install -D -d reference $(DESTDIR)/usr/share/upp/reference
-	cp -r tutorial $(DESTDIR)/usr/share/upp
-#	install -D -d tutorial $(DESTDIR)/usr/share/upp/tutorial
+#	mkdir -p $(DESTDIR)/bin
+#	mkdir -p $(DESTDIR)/share/applications
+#	mkdir -p $(DESTDIR)/share/pixmaps
+#	mkdir -p $(DESTDIR)/share/upp
+
+	-install -D $(OutFile) $(DESTDIR)/bin/theide
+	-install -D uppsrc/ide/theide.desktop $(DESTDIR)/share/applications/theide.desktop
+	-install -D uppsrc/ide/theide-48.png $(DESTDIR)/share/pixmaps/theide.png
+
+	-mkdir -p $(DESTDIR)/share/upp/
+	-cp -r Common/ $(DESTDIR)/share/upp/
+#	install -D -d Common $(DESTDIR)/share/upp/Common
+	-cp -r uppsrc/ $(DESTDIR)/share/upp/
+#	install -D -d uppsrc $(DESTDIR)/share/upp/uppsrc
+	-cp -r examples/ $(DESTDIR)/share/upp/
+#	install -D -d examples $(DESTDIR)/share/upp/examples
+	-cp -r reference/ $(DESTDIR)/share/upp/
+#	install -D -d reference $(DESTDIR)/share/upp/reference
+	-cp -r tutorial/ $(DESTDIR)/share/upp/
+#	install -D -d tutorial $(DESTDIR)/share/upp/tutorial
 
-	install -D uppsrc/ide/GCC.bm $(DESTDIR)/usr/share/upp
+	-install -D uppsrc/ide/GCC.bm $(DESTDIR)/share/upp/
 
 .PHONY: clean
 clean:
@@ -39,8 +39,8 @@
 
 .PHONY: uninstall
 uninstall:
-	${RM} $(DESTDIR)/usr/bin/theide
-	${RM} $(DESTDIR)/usr/share/applications/theide.desktop
-	${RM} $(DESTDIR)/usr/share/pixmaps/theide.png
+	${RM} $(DESTDIR)/bin/theide
+	${RM} $(DESTDIR)/share/applications/theide.desktop
+	${RM} $(DESTDIR)/share/pixmaps/theide.png
 
-	${RM} -r $(DESTDIR)/usr/share/upp
+	${RM} -r $(DESTDIR)/share/upp