blob: 7c64bc3e86cba11ccd5eb24a722f0604cfeec8d9 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
|
$NetBSD: patch-ad,v 1.4 2008/02/28 20:59:03 drochner Exp $
--- Makefile.orig 2008-02-27 10:24:44.000000000 +0100
+++ Makefile
@@ -10,7 +10,7 @@
VERSION=1.8.1
# define install target dirs
-prefix=/usr
+prefix=${PREFIX}
bindir=$(prefix)/bin
datadir=$(prefix)/share
@@ -125,7 +125,7 @@ BIN=./bin
OBJ=./bin
#define proper install flags
-INSTALL=install -D
+INSTALL=install -c
ifdef OSX_BUILD
INSTALL=install -c
endif
@@ -164,7 +164,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
@@ -197,7 +197,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 \
@@ -626,7 +625,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 \
|
