$NetBSD: patch-aa,v 1.1.1.1 2003/04/19 08:36:39 salo Exp $ --- Makefile.orig 2002-07-18 15:20:32.000000000 +0200 +++ Makefile 2003-04-19 10:14:12.000000000 +0200 @@ -7,11 +7,11 @@ ############## Public section. Modify according to your needs. ############### -CC = gcc -RM = rm -f -CP = cp +#CC = gcc +#RM = rm -f +#CP = cp -DESTDIR = /usr/local +DESTDIR = ${PREFIX} IPATH = LPATH = OPTI = -O3 -funroll-loops -fomit-frame-pointer #-mcpu=i686 @@ -19,8 +19,8 @@ WARN = #-W -Wall #-pedantic -ansi ### Unix version ### -CFLAGS = ${OPTI} ${DBUG} ${WARN} ${IPATH} `gtk-config --cflags` -LDFLAGS = ${OPTI} ${DBUG} ${WARN} ${LPATH} `gtk-config --libs` +CFLAGS += `gtk-config --cflags` +LDFLAGS += `gtk-config --libs` NAME = beaver ### Windows version ### @@ -32,10 +32,6 @@ ###################### Private section. Do not modify ######################## -ifndef DBUG - STRIP = strip --strip-all ${NAME} -endif - SRC = main.c search.c tools.c languages.c editor.c prefs.c conf.c msgbar.c\ toolbar.c interface.c filesops.c completion.c undoredo.c INC = ${SRC:.c=.h} struct.h wordfile.h @@ -43,7 +39,6 @@ all : ${OBJ} ${CC} -o ${NAME} ${OBJ} ${LDFLAGS} - @${STRIP} .c.o : ${CC} ${CFLAGS} -c $< -o $@ @@ -51,29 +46,11 @@ ${OBJ} : ${INC} install : - install -d $(DESTDIR)/bin - install beaver $(DESTDIR)/bin - install -d $(DESTDIR)/share/beaver/bl - $(CP) ../bl/* $(DESTDIR)/share/beaver/bl - install -d $(DESTDIR)/share/pixmaps - $(CP) ../pixmaps/beaver.png $(DESTDIR)/share/pixmaps - gzip -c9 ../beaver.1x > ../beaver.1x.gz - install -d $(DESTDIR)/man/man1 - $(CP) ../beaver.1x.gz $(DESTDIR)/man/man1 - @echo - @echo "Files installed :" - @echo "-----------------" - @echo - @echo "$(DESTDIR)/bin/beaver" - @echo "$(DESTDIR)/share/beaver/bl/example1.bl" - @echo "$(DESTDIR)/share/beaver/bl/example2.bl" - @echo "$(DESTDIR)/share/beaver/bl/glib.bl" - @echo "$(DESTDIR)/share/pixmaps/beaver.png" - @echo "$(DESTDIR)/man/man1/beaver.1x.gz" - @echo - @echo ",----------------------------------." - @echo "| Beaver succesfully installed ^_^ |" - @echo "\`----------------------------------'" + ${BSD_INSTALL_PROGRAM} beaver $(DESTDIR)/bin + ${BSD_INSTALL_DATA_DIR} $(DESTDIR)/share/beaver/bl + ${BSD_INSTALL_DATA} ../bl/* $(DESTDIR)/share/beaver/bl + ${BSD_INSTALL_DATA} ../pixmaps/beaver.png $(DESTDIR)/share/pixmaps + ${BSD_INSTALL_MAN} ../beaver.1x $(DESTDIR)/man/man1/beaver.1 .PHONY: clean re