$NetBSD: patch-ac,v 1.2 2005/10/04 18:00:49 wiz Exp $

--- build/gmake/Makefile.orig	2005-05-03 08:58:08.000000000 +0200
+++ build/gmake/Makefile	2005-07-03 14:56:45.000000000 +0200
@@ -58,8 +58,8 @@
 PROJECT=tidy
 
 # Installation variables.  Spaces OK, only dir create and file copy operations.
-runinst_prefix=/usr/local
-devinst_prefix=/usr/local
+runinst_prefix=${PREFIX}
+devinst_prefix=${PREFIX}
 
 bininst = ${runinst_prefix}/bin
 libinst = ${devinst_prefix}/lib
@@ -79,14 +79,14 @@
 # CFLAGS etc..
 # For optimised builds, flags such as "-O2" should be added and -D_DEBUG=1
 # disabled.
-CC= gcc
-CFLAGS= -g -Wall -Wno-switch -Wno-parentheses -I $(INCDIR)
+#CC= gcc
+CFLAGS+= -g -Wall -Wno-switch -Wno-parentheses -I $(INCDIR)
 # flags only supported with gcc 3.x
 # CFLAGS += -Wunused-parameter
 
 OTHERCFLAGS=
 OTHERCFLAGS+= -D_DEBUG=1
-# OTHERCFLAGS+= -DSUPPORT_ACCESSIBILITY_CHECKS=1 -DSUPPORT_UTF16_ENCODINGS=1 -DSUPPORT_ASIAN_ENCODINGS=1
+OTHERCFLAGS+= -DSUPPORT_ACCESSIBILITY_CHECKS=1 -DSUPPORT_UTF16_ENCODINGS=1 -DSUPPORT_ASIAN_ENCODINGS=1
 ifdef SUPPORT_UTF16_ENCODINGS
 CFLAGS += -DSUPPORT_UTF16_ENCODINGS=$(SUPPORT_UTF16_ENCODINGS)
 endif
@@ -115,7 +115,7 @@
 OBJSUF = .o
 
 LIBRARY = $(LIBDIR)/$(LIBPREFIX)$(PROJECT)$(LIBSUFFIX)
-AR=ar -r
+#AR=ar -r
 
 XSLTPROC = xsltproc
 
@@ -164,7 +164,7 @@
 
 $(LIBRARY): $(OBJFILES)
 	if [ ! -d $(LIBDIR) ]; then mkdir $(LIBDIR); fi
-	$(AR) $@ $(OBJFILES)
+	$(AR) -r $@ $(OBJFILES)
 ifdef RANLIB
 	$(RANLIB) $@
 endif
@@ -205,19 +205,19 @@
 	if [ "$(BINDIR)" != "$(TOPDIR)" -a -d $(BINDIR) ]; then rmdir $(BINDIR); fi
 
 installhdrs: $(HFILES)
-	if [ ! -d "$(incinst)" ]; then mkdir -p "$(incinst)"; fi
-	cp -f $(HFILES) "$(incinst)/"
+	if [ ! -d "$(incinst)" ]; then $(BSD_INSTALL_DATA_DIR) "$(incinst)"; fi
+	$(BSD_INSTALL_DATA) $(HFILES) "$(incinst)/"
 
 installib: $(LIBRARY)
-	if [ ! -d "$(libinst)" ]; then mkdir -p "$(libinst)"; fi
-	cp -f $(LIBRARY) "$(libinst)/"
+	if [ ! -d "$(libinst)" ]; then $(BSD_INSTALL_DATA_DIR) "$(libinst)"; fi
+	$(BSD_INSTALL_DATA) $(LIBRARY) "$(libinst)/"
 
 installexes: $(EXES)
-	if [ ! -d "$(bininst)" ]; then mkdir -p "$(bininst)"; fi
-	cp -f $(EXES) "$(bininst)/"
+	if [ ! -d "$(bininst)" ]; then $(BSD_INSTALL_PROGRAM_DIR) "$(bininst)"; fi
+	$(BSD_INSTALL_PROGRAM) $(EXES) "$(bininst)/"
 
 installmanpage: $(DOCDIR)/tidy.1
-	if [ ! -d "$(maninst)/man1" ]; then mkdir -p "$(maninst)/man1"; fi;
-	cp -f $(DOCDIR)/tidy.1 "$(maninst)/man1/tidy.1";
+	if [ ! -d "$(maninst)/man1" ]; then $(BSD_INSTALL_MAN_DIR) "$(maninst)/man1"; fi;
+	$(BSD_INSTALL_MAN) $(DOCDIR)/tidy.1 "$(maninst)/man1/tidy.1";
 
 install: installhdrs installib installmanpage installexes