Lines 1-5
Link Here
|
1 |
--- Makefile.orig 2008-02-27 10:24:44.000000000 +0100 |
1 |
--- Makefile.orig 2008-03-25 07:15:46.000000000 +0100 |
2 |
+++ Makefile 2008-03-20 17:06:20.445074259 +0100 |
2 |
+++ Makefile 2008-03-29 09:39:23.279570569 +0100 |
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-14
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 |
@@ -129,12 +130,18 @@ |
11 |
@@ -134,12 +135,18 @@ |
12 |
ifdef OSX_BUILD |
12 |
ifdef OSX_BUILD |
13 |
INSTALL=install -c |
13 |
INSTALL=install -c |
14 |
endif |
14 |
endif |
Lines 27-33
Link Here
|
27 |
|
27 |
|
28 |
MD5SUM=md5sum |
28 |
MD5SUM=md5sum |
29 |
ifneq ($(OSX_BUILD),) |
29 |
ifneq ($(OSX_BUILD),) |
30 |
@@ -164,7 +171,7 @@ |
30 |
@@ -170,7 +177,7 @@ |
31 |
ifdef WINDIR |
31 |
ifdef WINDIR |
32 |
LD=$(QL) $(CXX) $(DEBUG) $(PROFILE) $(LDFLAGS) -L$(OBJ) -lz |
32 |
LD=$(QL) $(CXX) $(DEBUG) $(PROFILE) $(LDFLAGS) -L$(OBJ) -lz |
33 |
else |
33 |
else |
Lines 36-42
Link Here
|
36 |
endif |
36 |
endif |
37 |
|
37 |
|
38 |
ifndef OSX_BUILD |
38 |
ifndef OSX_BUILD |
39 |
@@ -520,7 +527,7 @@ |
39 |
@@ -526,7 +533,7 @@ |
40 |
rm -f po/messages.mo; \ |
40 |
rm -f po/messages.mo; \ |
41 |
msgfmt $$i -o po/messages.mo; \ |
41 |
msgfmt $$i -o po/messages.mo; \ |
42 |
echo "Installing: $(DESTDIR)$(datadir)/locale/$$loc/LC_MESSAGES/notecase.mo";\ |
42 |
echo "Installing: $(DESTDIR)$(datadir)/locale/$$loc/LC_MESSAGES/notecase.mo";\ |
Lines 45-51
Link Here
|
45 |
mkdir -p $(DESTDIR)$(datadir)/locale/$$loc/LC_MESSAGES/; \ |
45 |
mkdir -p $(DESTDIR)$(datadir)/locale/$$loc/LC_MESSAGES/; \ |
46 |
fi; \ |
46 |
fi; \ |
47 |
$(INSTALL) -m 644 po/messages.mo "$(DESTDIR)$(datadir)/locale/$$loc/LC_MESSAGES/notecase.mo"; \ |
47 |
$(INSTALL) -m 644 po/messages.mo "$(DESTDIR)$(datadir)/locale/$$loc/LC_MESSAGES/notecase.mo"; \ |
48 |
@@ -531,12 +538,17 @@ |
48 |
@@ -537,12 +544,17 @@ |
49 |
pouninstall: |
49 |
pouninstall: |
50 |
@rm -vf $(DESTDIR)$(datadir)/locale/*/LC_MESSAGES/notecase.mo |
50 |
@rm -vf $(DESTDIR)$(datadir)/locale/*/LC_MESSAGES/notecase.mo |
51 |
@echo done uninstalling translations |
51 |
@echo done uninstalling translations |
Lines 65-71
Link Here
|
65 |
mkdir -p $(DESTDIR)$(bindir); \ |
65 |
mkdir -p $(DESTDIR)$(bindir); \ |
66 |
mkdir -p $(DESTDIR)$(datadir)/doc/notecase/; \ |
66 |
mkdir -p $(DESTDIR)$(datadir)/doc/notecase/; \ |
67 |
mkdir -p $(DESTDIR)$(datadir)/applications/; \ |
67 |
mkdir -p $(DESTDIR)$(datadir)/applications/; \ |
68 |
@@ -544,7 +556,6 @@ |
68 |
@@ -550,7 +562,6 @@ |
69 |
mkdir -p $(DESTDIR)$(datadir)/pixmaps/; \ |
69 |
mkdir -p $(DESTDIR)$(datadir)/pixmaps/; \ |
70 |
fi; |
70 |
fi; |
71 |
$(INSTALL) -m 755 $(BIN)/notecase$(EXE) "$(DESTDIR)$(bindir)/notecase$(EXE)" |
71 |
$(INSTALL) -m 755 $(BIN)/notecase$(EXE) "$(DESTDIR)$(bindir)/notecase$(EXE)" |
Lines 73-75
Link Here
|
73 |
$(INSTALL) -m 644 docs/notecase.xml "$(DESTDIR)$(datadir)/mime/packages/notecase.xml" |
73 |
$(INSTALL) -m 644 docs/notecase.xml "$(DESTDIR)$(datadir)/mime/packages/notecase.xml" |
74 |
$(Q)if [ -n "$(NOKIA_MAEMO_BUILD)" ]; then \ |
74 |
$(Q)if [ -n "$(NOKIA_MAEMO_BUILD)" ]; then \ |
75 |
$(INSTALL) -m 644 docs/notecase.desktop "$(DESTDIR)$(datadir)/applications/hildon/notecase.desktop"; \ |
75 |
$(INSTALL) -m 644 docs/notecase.desktop "$(DESTDIR)$(datadir)/applications/hildon/notecase.desktop"; \ |
|
|
76 |
@@ -742,7 +753,7 @@ |
77 |
# |
78 |
# Note: first "make" command forces generating correct help file path in "config.h" |
79 |
# |
80 |
-DEBSIZE:=$(shell du -ks ./notecase/ | cut -f 1) |
81 |
+#DEBSIZE:=$(shell du -ks ./notecase/ | cut -f 1) |
82 |
|
83 |
deb: clean |
84 |
$(Q)mkdir ./notecase |