--- Makefile~	2006-09-14 14:02:58 +0400
+++ Makefile	2006-12-04 16:11:35 +0300
@@ -9,7 +9,7 @@ THEMES	 = $(wildcard themes/*)
 all:	bin2c mkbootmsg bincode mkblfont addblack
 
 mkblfont: mkblfont.c
-	$(CC) $(CFLAGS) -I /usr/include/freetype2 -lfreetype $< -o $@
+	$(CC) $(CFLAGS) -I /usr/include/freetype2 $< -o $@ -lfreetype
 
 mkbootmsg: mkbootmsg.c vocabulary.h bincode.h
 	$(CC) $(CFLAGS) $< -o $@
@@ -40,10 +40,10 @@ jpeg.o: jpeg.S
 	as --32 -ahlsn=jpeg.lst -o $@ $<
 
 install: all
-	install -d -m 755 $(DESTDIR)/usr/sbin $(DESTDIR)/usr/share/gfxboot
-	install -m 755 mkbootmsg mkblfont help2txt $(DESTDIR)/usr/sbin
-	cp -a themes $(DESTDIR)/usr/share/gfxboot
-	cp -a bin $(DESTDIR)/usr/share/gfxboot
+	install -d -m 0755 $(DESTDIR)/usr/share/gfxboot
+	install -m 0755 bin/* $(DESTDIR)/usr/share/gfxboot
+	install -d -m 0755 $(DESTDIR)/usr/bin
+	install -m 0755 mkbootmsg mkblfont help2txt $(DESTDIR)/usr/bin
 
 clean: themes doc
 	@rm -f mkbootmsg bincode mkblfont addblack bincode.h bin2c *.lst *.map vocabulary.inc vocabulary.h *.o *~