$NetBSD: patch-ad,v 1.6 2010/01/29 19:54:39 joerg Exp $

--- Makefile.orig	2008-04-24 10:10:36.000000000 +0000
+++ Makefile
@@ -10,7 +10,7 @@
 VERSION=1.8.8
 
 # define install target dirs
-prefix=/usr
+prefix=${PREFIX}
 bindir=$(prefix)/bin
 datadir=$(prefix)/share
 
@@ -130,7 +130,7 @@ BIN=./bin
 OBJ=./bin
 
 #define proper install flags
-INSTALL=install -D
+INSTALL=install -c
 ifdef OSX_BUILD
  INSTALL=install -c
 endif 
@@ -170,7 +170,7 @@ CC=$(QC) $(CXX) $(DEBUG) $(PROFILE) -DEN
 ifdef WINDIR
  LD=$(QL) $(CXX) $(DEBUG) $(PROFILE) $(LDFLAGS) -L$(OBJ) -lz 
 else
- LD=$(QL) $(CXX) $(DEBUG) $(PROFILE) $(LDFLAGS) -ldl
+ LD=$(QL) $(CXX) $(DEBUG) $(PROFILE) $(LDFLAGS) -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -lz
 endif
 
 ifndef OSX_BUILD 
@@ -203,7 +203,6 @@ OBJS= $(OBJ)/main.o $(OBJ)/support.o $(O
  $(OBJ)/IOLayerRedirect.o $(OBJ)/FileExportDlg.o $(OBJ)/FormatIOTxt.o $(OBJ)/FindReplaceDlg.o \
  $(OBJ)/FindReplaceInfo.o $(OBJ)/LinkInfo.o $(OBJ)/LinkPropertiesDlg.o $(OBJ)/ExecuteFile.o \
  $(OBJ)/FileSaveAsDlg.o $(OBJ)/CircularBuffer.o $(OBJ)/FormatIOMMLX.o \
- $(OBJ)/libz.a \
  $(OBJ)/ProgressDlg.o $(OBJ)/DocActionPix.o $(OBJ)/DocActionFinish.o $(OBJ)/DocActionFmt.o $(OBJ)/FmtInfo.o \
  $(OBJ)/FileAttachmentDlg.o $(OBJ)/DocActionAtt.o $(OBJ)/PixPropertiesDlg.o $(OBJ)/DocActionFinishDel.o \
  $(OBJ)/ShortcutsList.o $(OBJ)/ShortcutsListDlg.o $(OBJ)/DateTimeDlg.o $(OBJ)/AboutDlg.o $(OBJ)/EditDlg.o \
@@ -526,9 +525,7 @@ poinstall:
 		rm -f po/messages.mo; \
 		msgfmt $$i -o po/messages.mo; \
 		echo "Installing: $(DESTDIR)$(datadir)/locale/$$loc/LC_MESSAGES/notecase.mo";\
-		if [ "$(OSX_BUILD)" = "1" ]; then \
-			mkdir -p $(DESTDIR)$(datadir)/locale/$$loc/LC_MESSAGES/; \
-		fi; \
+		mkdir -p $(DESTDIR)$(datadir)/locale/$$loc/LC_MESSAGES/; \
 		$(INSTALL) -m 644 po/messages.mo "$(DESTDIR)$(datadir)/locale/$$loc/LC_MESSAGES/notecase.mo"; \
 	done; \
 	rm -f po/messages.mo; 
@@ -630,7 +627,7 @@ updatesrc:
 	$(Q)$(SED) 's/^Version:.*/Version:        $(VERSION)/' ./docs/notecase.spec
 	$(Q)$(SED) 's/^Source:.*/Source:         $(archive)_src.tar.gz/' ./docs/notecase.spec
 	$(Q)$(SED) 's/\#define APP_VER_STR .*/\#define APP_VER_STR "$(VERSION)"/' ./src/config.h
-	#$(Q)$(SED) 's:\#define INSTALL_PREFIX .*:\#define INSTALL_PREFIX "$(DESTDIR)$(prefix)":' ./src/config.h
+	$(Q)$(SED) 's:\#define INSTALL_PREFIX .*:\#define INSTALL_PREFIX "$(DESTDIR)$(prefix)":' ./src/config.h
 	$(Q)if [ "$(HAVE_GNOME_VFS)" = "" ]; then \
 		$(SED) 's:[/]*#define HAVE_GNOME_VFS.*://#define HAVE_GNOME_VFS:' ./src/config.h; \
 	else \