1 files changed, 27 insertions, 10 deletions

diff --git a/Makefile b/Makefile
index f786edaf..f9fdd8b4 100644
--- a/Makefile
+++ b/Makefile
@@ -2,17 +2,17 @@ GTK_LIBS = -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocai
 GTK_CFLAGS = -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
 GLADE_LIBS = 
 GLADE_CFLAGS = 
-PACKAGE = hardinfo-0.4
+PACKAGE = hardinfo-0.4.1
 ARCHOPTS = 
 
-CC = gcc -fPIC -pipe -O3 $(ARCHOPTS)
-CCSLOW = gcc -fPIC -pipe -O0
-CFLAGS = -Wall -g $(GTK_CFLAGS) $(GLADE_CFLAGS) -I.
+CC = gcc -O3 $(ARCHOPTS) 
+CCSLOW = gcc -O0
+CFLAGS = -fPIC -pipe -Wall -g $(GTK_CFLAGS) $(GLADE_CFLAGS) -I.
 
 # ----------------------------------------------------------------------------
 
 OBJECTS = hardinfo.o shell.o util.o iconcache.o loadgraph.o sha1.o md5.o \
-		menu.o stock.o callbacks.o expr.o report.o blowfish.o
+		menu.o stock.o callbacks.o expr.o report.o blowfish.o binreloc.o
 MODULES = computer.so devices.so benchmark.so 
 
 all:	$(OBJECTS) $(MODULES)
@@ -32,7 +32,7 @@ sha1.o:
 	@echo "--- Module: $< ($@)"
 	$(CC) $(CFLAGS) -o $@ -shared $< $(GTK_FLAGS) $(GTK_LIBS) \
 		$(GLADE_LIBS) $(GLADE_FLAGS)
-	mv $@ modules
+	mv -f $@ modules
 	
 clean:
 	rm -rf .xvpics pixmaps/.xvpics *.o *.so hardinfo modules/*.so report
@@ -53,16 +53,33 @@ deb:	dist-clean
 	dpkg-buildpackage -rfakeroot -k${USER}
 
 install:	all
+	@echo '*** Creating directories...'
 	mkdir -p ${DESTDIR}/usr/bin
-	cp hardinfo ${DESTDIR}/usr/bin/hardinfo
-	mkdir -p ${DESTDIR}/usr/share/hardinfo/modules
+	mkdir -p ${DESTDIR}/usr/local
+	mkdir -p ${DESTDIR}/usr/share/applications
 	mkdir -p ${DESTDIR}/usr/lib/hardinfo/modules
-	cp -rv modules/*.so ${DESTDIR}/usr/lib/hardinfo/modules
 	mkdir -p ${DESTDIR}/usr/share/hardinfo/pixmaps
-	cp -rv pixmaps/* ${DESTDIR}/usr/share/hardinfo/pixmaps
+
+	@echo '*** Installing icon...'
+	cp hardinfo.desktop ${DESTDIR}/usr/share/applications
+
+	@echo '*** Installing executable...'
+	cp hardinfo ${DESTDIR}/usr/bin/hardinfo
+
+	@echo '*** Installing modules...'
+	cp -r modules/*.so ${DESTDIR}/usr/lib/hardinfo/modules
+
+	@echo '*** Installing pixmaps...'
+	cp -r pixmaps/* ${DESTDIR}/usr/share/hardinfo/pixmaps
+
+	@echo '*** Installing misc data...'
 	cp uidefs.xml ${DESTDIR}/usr/share/hardinfo
 	cp modules.conf ${DESTDIR}/usr/share/hardinfo
 	cp benchmark.conf ${DESTDIR}/usr/share/hardinfo
 	cp benchmark.data ${DESTDIR}/usr/share/hardinfo
+
+	@echo '*** Fixing permissions...'
+	#chmod -R 755 ${DESTDIR}/usr/share/hardinfo
 	chmod 755 ${DESTDIR}/usr/bin/hardinfo
 
+	@echo '*** Done installing.'