$NetBSD: patch-ab,v 1.4 1998/08/23 06:55:03 garbled Exp $ --- sources/Makefile.orig Mon Nov 15 22:47:49 1993 +++ sources/Makefile Tue Jul 28 11:39:53 1998 @@ -34,7 +34,7 @@ # Installation sites (GNU conventions): # -prefix = /usr/local +prefix = ${PREFIX} bindir = $(prefix)/bin includedir = $(prefix)/include mandir = $(prefix)/man @@ -47,8 +47,8 @@ CC = gcc CFLAGS = -O2 -Wall -ansi -fstrength-reduce -finline-functions -LFLAGS = # only sometimes needed; see below for examples -CPPFLAGS = -I. # only sometimes needed; see below for examples +LFLAGS = -Wl,-R${X11BASE}/lib -L${X11BASE}/lib # only sometimes needed; see below for examples +CPPFLAGS = -I. -I${X11BASE}/include # only sometimes needed; see below for examples BINDCMD = # only needed for EMX and DJGPP DOS extenders @@ -279,15 +279,11 @@ install: install-bin install-info install-man install-bin: $(PROGRAM) - -$(STRIP) $(PROGRAM) - $(CP) $(PROGRAM) $(bindir) - $(CHMOD) 755 $(bindir)/$(PROGRAM) + ${BSD_INSTALL_PROGRAM} $(PROGRAM) $(bindir) install-info: hp2xx.info - $(CP) hp2xx.info $(infodir) - $(CHMOD) 644 $(infodir)/hp2xx.info + ${BSD_INSTALL_MAN} hp2xx.info $(infodir) install-man: ../doc/hp2xx.1 - $(CP) ../doc/hp2xx.1 $(man1dir) - $(CHMOD) 644 $(man1dir)/hp2xx.1 + ${BSD_INSTALL_MAN} ../doc/hp2xx.1 $(man1dir)