|
Lines 1-5
Link Here
|
| 1 |
--- Makefile.orig 2008-04-28 15:58:53.000000000 +0200 |
1 |
--- Makefile.orig 2008-05-21 12:28:06.000000000 +0200 |
| 2 |
+++ Makefile 2008-04-28 16:06:53.000000000 +0200 |
2 |
+++ Makefile 2008-05-27 12:30:12.154607211 +0200 |
| 3 |
@@ -13,6 +13,7 @@ |
3 |
@@ -13,6 +13,7 @@ |
| 4 |
prefix=/usr |
4 |
prefix=/usr |
| 5 |
bindir=$(prefix)/bin |
5 |
bindir=$(prefix)/bin |
|
Lines 8-33
Link Here
|
| 8 |
|
8 |
|
| 9 |
# define top of RPM build area |
9 |
# define top of RPM build area |
| 10 |
topdir=/usr/src/redhat |
10 |
topdir=/usr/src/redhat |
| 11 |
@@ -134,12 +135,18 @@ |
11 |
@@ -177,7 +178,7 @@ |
| 12 |
ifdef OSX_BUILD |
|
|
| 13 |
INSTALL=install -c |
| 14 |
endif |
| 15 |
+ifdef FREEBSD_BUILD |
| 16 |
+ INSTALL=install |
| 17 |
+endif |
| 18 |
|
| 19 |
#define proper sed (use gnused for Darwin?) |
| 20 |
SED=sed -i |
| 21 |
ifneq ($(OSX_BUILD),) |
| 22 |
SED=sed -i.bak |
| 23 |
endif |
| 24 |
+ifneq ($(FREEBSD_BUILD),) |
| 25 |
+ SED=sed -i.bak |
| 26 |
+endif |
| 27 |
|
| 28 |
MD5SUM=md5sum |
| 29 |
ifneq ($(OSX_BUILD),) |
| 30 |
@@ -170,7 +177,7 @@ |
| 31 |
ifdef WINDIR |
12 |
ifdef WINDIR |
| 32 |
LD=$(QL) $(CXX) $(DEBUG) $(PROFILE) $(LDFLAGS) -L$(OBJ) -lz |
13 |
LD=$(QL) $(CXX) $(DEBUG) $(PROFILE) $(LDFLAGS) -L$(OBJ) -lz |
| 33 |
else |
14 |
else |
|
Lines 36-65
Link Here
|
| 36 |
endif |
17 |
endif |
| 37 |
|
18 |
|
| 38 |
ifndef OSX_BUILD |
19 |
ifndef OSX_BUILD |
| 39 |
@@ -526,7 +533,7 @@ |
20 |
@@ -544,18 +545,21 @@ |
| 40 |
rm -f po/messages.mo; \ |
|
|
| 41 |
msgfmt $$i -o po/messages.mo; \ |
| 42 |
echo "Installing: $(DESTDIR)$(datadir)/locale/$$loc/LC_MESSAGES/notecase.mo";\ |
| 43 |
- if [ "$(OSX_BUILD)" = "1" ]; then \ |
| 44 |
+ if [ "$(OSX_BUILD)" = "1" ] || [ "$(FREEBSD_BUILD)" = "1" ]; then \ |
| 45 |
mkdir -p $(DESTDIR)$(datadir)/locale/$$loc/LC_MESSAGES/; \ |
| 46 |
fi; \ |
| 47 |
$(INSTALL) -m 644 po/messages.mo "$(DESTDIR)$(datadir)/locale/$$loc/LC_MESSAGES/notecase.mo"; \ |
| 48 |
@@ -537,7 +544,12 @@ |
| 49 |
pouninstall: |
21 |
pouninstall: |
| 50 |
@rm -vf $(DESTDIR)$(datadir)/locale/*/LC_MESSAGES/notecase.mo |
22 |
@rm -vf $(DESTDIR)$(datadir)/locale/*/LC_MESSAGES/notecase.mo |
| 51 |
@echo done uninstalling translations |
23 |
@echo done uninstalling translations |
| 52 |
- |
24 |
- |
| 53 |
+ |
25 |
+ |
| 54 |
+docinstall: |
26 |
+docinstall: |
| 55 |
+ mkdir -p $(docsdir) |
27 |
+ install -d -m 755 "$(docsdir)" |
| 56 |
+ $(INSTALL) -m 644 -c docs/help.ncd "$(docsdir)/help.ncd" |
28 |
+ $(INSTALL) -m 644 -c docs/help.ncd "$(docsdir)/help.ncd" |
| 57 |
+ $(INSTALL) -m 644 -c docs/license.txt "$(docsdir)/license.txt" |
29 |
+ $(INSTALL) -m 644 -c docs/license.txt "$(docsdir)/license.txt" |
| 58 |
+ |
30 |
+ |
| 59 |
# |
31 |
# |
| 60 |
# install application |
32 |
# install application |
| 61 |
# |
33 |
# |
| 62 |
@@ -548,7 +560,6 @@ |
34 |
install: notecase$(EXE) poinstall |
|
|
35 |
install -d -m 755 $(DESTDIR)$(bindir) |
| 36 |
- install -d -m 755 $(DESTDIR)$(datadir)/doc/notecase/ |
| 37 |
install -d -m 755 $(DESTDIR)$(datadir)/applications/ |
| 63 |
install -d -m 755 $(DESTDIR)$(datadir)/mime/packages/ |
38 |
install -d -m 755 $(DESTDIR)$(datadir)/mime/packages/ |
| 64 |
install -d -m 755 $(DESTDIR)$(datadir)/pixmaps/ |
39 |
install -d -m 755 $(DESTDIR)$(datadir)/pixmaps/ |
| 65 |
$(INSTALL) -m 755 $(BIN)/notecase$(EXE) "$(DESTDIR)$(bindir)/notecase$(EXE)" |
40 |
$(INSTALL) -m 755 $(BIN)/notecase$(EXE) "$(DESTDIR)$(bindir)/notecase$(EXE)" |
|
Lines 67-73
Link Here
|
| 67 |
$(INSTALL) -m 644 docs/notecase.xml "$(DESTDIR)$(datadir)/mime/packages/notecase.xml" |
42 |
$(INSTALL) -m 644 docs/notecase.xml "$(DESTDIR)$(datadir)/mime/packages/notecase.xml" |
| 68 |
$(Q)if [ -n "$(NOKIA_MAEMO_BUILD)" ]; then \ |
43 |
$(Q)if [ -n "$(NOKIA_MAEMO_BUILD)" ]; then \ |
| 69 |
$(INSTALL) -m 644 docs/notecase.desktop "$(DESTDIR)$(datadir)/applications/hildon/notecase.desktop"; \ |
44 |
$(INSTALL) -m 644 docs/notecase.desktop "$(DESTDIR)$(datadir)/applications/hildon/notecase.desktop"; \ |
| 70 |
@@ -740,7 +751,7 @@ |
45 |
@@ -747,7 +751,7 @@ |
| 71 |
# |
46 |
# |
| 72 |
# Note: first "make" command forces generating correct help file path in "config.h" |
47 |
# Note: first "make" command forces generating correct help file path in "config.h" |
| 73 |
# |
48 |
# |