$NetBSD: patch-aa,v 1.1.1.1 2006/01/16 13:18:29 rxg Exp $ --- Makefile.orig 2002-03-20 13:59:19.000000000 +0800 +++ Makefile @@ -6,11 +6,11 @@ # set INSTALLROOT to the installation base; it is used to set the # other directory variables below -INSTALLROOT = /usr/local +INSTALLROOT = $(PREFIX) #INSTALLROOT = /usr # set LIBDIR to where you will keep the datafiles, fontspecs, and "hanwin.tcl" -LIBDIR = $(INSTALLROOT)/lib/Hanzim +LIBDIR = $(INSTALLROOT)/lib/hanzim #LIBDIR = /usr/local/lib/Hanzim # for debugging #LIBDIR = ./Data @@ -24,7 +24,7 @@ MANDIR = $(INSTALLROOT)/man #MANDIR = /usr/local/man # set DOCDIR to where you want the documentation files to reside -DOCDIR = $(INSTALLROOT)/doc +DOCDIR = $(INSTALLROOT)/share/doc/hanzim #DOCDIR = $(INSTALLROOT)/share/doc #DOCDIR = /usr/local/share/doc #DOCDIR = /usr/share/doc @@ -41,13 +41,13 @@ OS=UNIX #OS=WINDOWS # location of Tcl and Tk libraries -LIBTCLDIR = -L /usr/lib +#LIBTCLDIR = -L /usr/lib # location of x library -LIBXDIR = -L /usr/X11/lib +#LIBXDIR = -L /usr/X11/lib # you might need to change "libtcl" and "libtk" to "libtcl8.x" and "libtk8.x" -LIBS = $(LIBXDIR) $(LIBTCLDIR) -ltk -ltcl -lX11 -lm -ldl +LIBS = $(LIBXDIR) $(LIBTCLDIR) -ltk -ltcl -lX11 -lm -lpthread INSTALL = install RM = rm -f @@ -55,11 +55,11 @@ RM = rm -f # End of configuration. ############################################################################### -CC = cc +#CC = cc DEFINES = -D$(OS) -DLIBDIR=\"$(LIBDIR)\" -CFLAGS = -O2 $(DEFINES) +CFLAGS += $(DEFINES) #CFLAGS = -O2 -Wall -pedantic -ansi $(DEFINES) -LFLAGS = $(LIBS) -s +LFLAGS = $(LIBS) $(LDFLAGS) DIST_FILES = Hanzim/hanzim.h Hanzim/hgb_utf.h \ Hanzim/hanzim.c Hanzim/hanwin.c Hanzim/hinit.c Hanzim/hutil.c \ @@ -87,13 +87,13 @@ DIST_FILES = Hanzim/hanzim.h Hanzim/hgb_ $(CC) $(CFLAGS) -c hutil.c install : hanzim - $(INSTALL) -s hanzim $(BINDIR) - $(INSTALL) -m 0644 hanzim.man $(MANDIR)/man1/hanzim.1 - $(INSTALL) -m 0755 -d $(DOCDIR) - $(INSTALL) -m 0644 hanzim.doc $(DOCDIR) - $(INSTALL) -m 0755 -d $(LIBDIR) + $(BSD_INSTALL_PROGRAM) hanzim $(BINDIR) + $(BSD_INSTALL_MAN) hanzim.man $(MANDIR)/man1/hanzim.1 + $(BSD_INSTALL_DATA_DIR) $(DOCDIR) + $(BSD_INSTALL_DATA) hanzim.doc $(DOCDIR) + $(BSD_INSTALL_DATA_DIR) $(LIBDIR) cd Data ; \ - $(INSTALL) -m 0644 hanwin.tcl fonts.unix fonts.windows \ + $(BSD_INSTALL_DATA) hanwin.tcl fonts.unix \ zidianf.gb zidianfl.b5 bushou.gb \ cidianf.gb sanzicidianf.gb parts.gb $(LIBDIR) $(BINDIR)/hanzim -buildDB