+++ /dev/null
-diff -Naur unifont-5.1.20080914.orig/font/Makefile unifont-5.1.20080914/font/Makefile
---- unifont-5.1.20080914.orig/font/Makefile 2008-09-08 11:22:52.000000000 +0900
-+++ unifont-5.1.20080914/font/Makefile 2008-12-31 23:29:52.000000000 +0900
-@@ -29,8 +29,8 @@
- #
- PKGDEST = $(DESTDIR)/usr/share/unifont
- FONTDEST = $(DESTDIR)/usr/share/fonts
--PCFDEST = $(FONTDEST)/X11/misc
--TTFDEST = $(FONTDEST)/truetype/unifont
-+PCFDEST = $(FONTDEST)/unifont
-+TTFDEST = $(FONTDEST)/unifont
- #
- # destination directory for compiled fonts
- #
-diff -Naur unifont-5.1.20080914.orig/hoge.y unifont-5.1.20080914/hoge.y
---- unifont-5.1.20080914.orig/hoge.y 1970-01-01 09:00:00.000000000 +0900
-+++ unifont-5.1.20080914/hoge.y 2008-12-31 23:55:28.000000000 +0900
-@@ -0,0 +1,15 @@
-+STARTFONT 2.1
-+FONT -gnu-unifont-medium-r-normal--16-160-75-75-c-80-iso10646-1
-+SIZE 16 75 75
-+FONTBOUNDINGBOX 16 16 0 -2
-+STARTPROPERTIES 7
-+PIXEL_SIZE 16
-+POINT_SIZE 160
-+FONT_ASCENT 14
-+FONT_DESCENT 2
-+CHARSET_REGISTRY "iso10646"
-+CHARSET_ENCODING "1"
-+DEFAULT_CHAR 32
-+ENDPROPERTIES
-+CHARS 0
-+ENDFONT
-diff -Naur unifont-5.1.20080914.orig/src/Makefile unifont-5.1.20080914/src/Makefile
---- unifont-5.1.20080914.orig/src/Makefile 2008-09-08 04:01:56.000000000 +0900
-+++ unifont-5.1.20080914/src/Makefile 2009-01-01 00:05:08.000000000 +0900
-@@ -1,5 +1,5 @@
-
--CFLAGS = -g -O2 -Wall
-+CFLAGS += -g -Wall
-
- INSTALLBINDIR = ../bin
-
-@@ -26,8 +26,8 @@
-
- all: $(CPROGS)
- install -m0755 -d $(INSTALLBINDIR)
-- install -s -m0755 $(CPROGS) $(INSTALLBINDIR)
-- install -m0755 $(PPROGS) $(INSTALLBINDIR)
-+ install -m0755 $(CPROGS) $(INSTALLBINDIR)
-+ install -m0755 $(PPROGS) $(INSTALLBINDIR)
- rm -f $(CPROGS)
-
- install:
-@@ -40,7 +40,7 @@
- install -m0755 -d $(INSTALLDIR)
- set -e ; \
- cd $(INSTALLBINDIR) ; \
-- install -s -m0755 $(CPROGS) $(INSTALLDIR)
-+ install -m0755 $(CPROGS) $(INSTALLDIR)
- set -e ; \
- cd ../bin ; \
- install -m0755 $(PPROGS) $(INSTALLDIR)
+++ /dev/null
-diff --git a/font/Makefile b/font/Makefile
-index e57a57d..04ed214 100644
---- a/font/Makefile
-+++ b/font/Makefile
-@@ -116,7 +116,7 @@ TTFSRC = ttfsrc
- all: compiled
-
- compiled: $(UNIFILES) $(COMBINING) $(UPPER_FILES) $(UPPER_COMBINING)
-- make compiled-files
-+ $(MAKE) compiled-files
-
- compiled-files: pcf psf bmp ttf csurttf upperttf uppercsurttf bigpic coverage
- install -p index.html $(COMPILED_DIR)/index.html
-@@ -277,7 +277,7 @@ ttf:
- $(HEXDIR)/bmp-combining.txt \
- $(TTFSRC)/combining.txt
- cd $(TTFSRC) ; \
-- make FONTFILE="unifont" COMBINING="combining" \
-+ $(MAKE) FONTFILE="unifont" COMBINING="combining" \
- FONTNAME="Unifont" PSNAME="Unifont"
- mv $(TTFSRC)/unifont.sfd $(COMPILED_DIR)/unifont-$(VERSION).sfd
- mv $(TTFSRC)/unifont.ttf \
-@@ -287,7 +287,7 @@ ttf:
- $(COMPILED_DIR)/unifont_sample-$(VERSION).bdf \
- $(TTFSRC)/unifont_sample.bdf
- cd $(TTFSRC) ; \
-- make sbit FONTFILE="unifont_sample" COMBINING="" \
-+ $(MAKE) sbit FONTFILE="unifont_sample" COMBINING="" \
- FONTNAME="Unifont Sample" PSNAME="UnifontSample"
- mv $(TTFSRC)/unifont_sample.ttf \
- $(COMPILED_DIR)/unifont_sample-$(VERSION).ttf
-@@ -303,7 +303,7 @@ csurttf:
- sort -u plane00csur/csur-combining.txt $(HEXDIR)/bmp-combining.txt \
- > $(TTFSRC)/combining_csur.txt
- cd $(TTFSRC) ; \
-- make outline FONTFILE="unifont_csur" COMBINING="combining_csur" \
-+ $(MAKE) outline FONTFILE="unifont_csur" COMBINING="combining_csur" \
- FONTNAME="Unifont CSUR" PSNAME="UnifontCSUR"
- mv $(TTFSRC)/unifont_csur.sfd \
- $(COMPILED_DIR)/unifont_csur-$(VERSION).sfd
-@@ -320,7 +320,7 @@ upperttf:
- $(TTFSRC)/unifont_upper.hex
- sort -u $(UPPER_COMBINING) > $(TTFSRC)/combining_upper.txt
- cd $(TTFSRC) ; \
-- make outline FONTFILE="unifont_upper" COMBINING="combining_upper" \
-+ $(MAKE) outline FONTFILE="unifont_upper" COMBINING="combining_upper" \
- FONTNAME="Unifont Upper" PSNAME="UnifontUpper"
- mv $(TTFSRC)/unifont_upper.sfd \
- $(COMPILED_DIR)/unifont_upper-$(VERSION).sfd
-@@ -339,7 +339,7 @@ uppercsurttf:
- sort -u plane0[1-F]csur/*combining*.txt \
- > $(TTFSRC)/combining_upper_csur.txt
- cd $(TTFSRC) ; \
-- make outline FONTFILE="unifont_upper_csur" COMBINING="combining_upper_csur" \
-+ $(MAKE) outline FONTFILE="unifont_upper_csur" COMBINING="combining_upper_csur" \
- FONTNAME="Unifont Upper CSUR" PSNAME="UnifontUpperCSUR"
- mv $(TTFSRC)/unifont_upper_csur.sfd \
- $(COMPILED_DIR)/unifont_upper_csur-$(VERSION).sfd
-diff --git a/Makefile b/Makefile
-index 3240c2b..f933067 100644
---- a/Makefile
-+++ b/Makefile
-@@ -65,7 +65,7 @@ bindir:
- buildfont:
- if [ x$(BUILDFONT) != x ] ; \
- then \
-- set -e ; make -C font ; \
-+ set -e ; $(MAKE) -C font ; \
- fi
-
- #