1 --- meld-1.4.0/Makefile Sun Sep 26 15:25:02 2010 |
|
2 +++ meld-1.4.0/new.Makefile Thu Apr 21 11:55:26 2011 |
|
3 @@ -47,7 +47,6 @@ |
|
4 $(DESTDIR)$(libdir_)/meld/vc \ |
|
5 $(DESTDIR)$(sharedir_)/ui \ |
|
6 $(DESTDIR)$(sharedir_)/icons \ |
|
7 - $(DESTDIR)$(docdir_) \ |
|
8 $(DESTDIR)$(sharedir)/applications \ |
|
9 $(DESTDIR)$(sharedir)/pixmaps \ |
|
10 $(DESTDIR)$(sharedir)/icons/hicolor/16x16/apps \ |
|
11 @@ -56,43 +55,44 @@ |
|
12 $(DESTDIR)$(sharedir)/icons/hicolor/48x48/apps \ |
|
13 $(DESTDIR)$(sharedir)/icons/hicolor/scalable/apps \ |
|
14 $(DESTDIR)$(helpdir_) |
|
15 - install -m 755 bin/meld.install \ |
|
16 +# $(DESTDIR)$(docdir_) |
|
17 + ginstall -m 555 bin/meld.install \ |
|
18 $(DESTDIR)$(bindir)/meld |
|
19 - install -m 644 meld/*.py \ |
|
20 + ginstall -m 444 meld/*.py \ |
|
21 $(DESTDIR)$(libdir_)/meld |
|
22 - install -m 644 meld/ui/*.py \ |
|
23 + ginstall -m 444 meld/ui/*.py \ |
|
24 $(DESTDIR)$(libdir_)/meld/ui |
|
25 - install -m 644 meld/util/*.py \ |
|
26 + ginstall -m 444 meld/util/*.py \ |
|
27 $(DESTDIR)$(libdir_)/meld/util |
|
28 - install -m 644 meld/vc/*.py \ |
|
29 + ginstall -m 444 meld/vc/*.py \ |
|
30 $(DESTDIR)$(libdir_)/meld/vc |
|
31 - install -m 644 meld/paths.py.install \ |
|
32 + ginstall -m 444 meld/paths.py.install \ |
|
33 $(DESTDIR)$(libdir_)/meld/paths.py |
|
34 - install -m 644 data/meld.desktop \ |
|
35 + ginstall -m 444 data/meld.desktop \ |
|
36 $(DESTDIR)$(sharedir)/applications |
|
37 $(PYTHON) -c 'import compileall; compileall.compile_dir("$(DESTDIR)$(libdir_)",10,"$(libdir_)")' |
|
38 - $(PYTHON) -O -c 'import compileall; compileall.compile_dir("$(DESTDIR)$(libdir_)",10,"$(libdir_)")' |
|
39 - install -m 644 \ |
|
40 +# $(PYTHON) -O -c 'import compileall; compileall.compile_dir("$(DESTDIR)$(libdir_)",10,"$(libdir_)")' |
|
41 + ginstall -m 444 \ |
|
42 data/ui/*.glade \ |
|
43 $(DESTDIR)$(sharedir_)/ui |
|
44 - install -m 644 \ |
|
45 + ginstall -m 444 \ |
|
46 data/ui/*.xml \ |
|
47 $(DESTDIR)$(sharedir_)/ui |
|
48 - install -m 644 \ |
|
49 + ginstall -m 444 \ |
|
50 data/icons/*.xpm \ |
|
51 data/icons/*.png \ |
|
52 $(DESTDIR)$(sharedir_)/icons |
|
53 - install -m 644 data/icons/icon.png \ |
|
54 + ginstall -m 444 data/icons/icon.png \ |
|
55 $(DESTDIR)$(sharedir)/pixmaps/meld.png |
|
56 - install -m 644 data/icons/16x16/meld.png \ |
|
57 + ginstall -m 444 data/icons/16x16/meld.png \ |
|
58 $(DESTDIR)$(sharedir)/icons/hicolor/16x16/apps/meld.png |
|
59 - install -m 644 data/icons/22x22/meld.png \ |
|
60 + ginstall -m 444 data/icons/22x22/meld.png \ |
|
61 $(DESTDIR)$(sharedir)/icons/hicolor/22x22/apps/meld.png |
|
62 - install -m 644 data/icons/32x32/meld.png \ |
|
63 + ginstall -m 444 data/icons/32x32/meld.png \ |
|
64 $(DESTDIR)$(sharedir)/icons/hicolor/32x32/apps/meld.png |
|
65 - install -m 644 data/icons/48x48/meld.png \ |
|
66 + ginstall -m 444 data/icons/48x48/meld.png \ |
|
67 $(DESTDIR)$(sharedir)/icons/hicolor/48x48/apps/meld.png |
|
68 - install -m 644 data/icons/48x48/meld.svg \ |
|
69 + ginstall -m 444 data/icons/48x48/meld.svg \ |
|
70 $(DESTDIR)$(sharedir)/icons/hicolor/scalable/apps/meld.svg |
|
71 $(MAKE) -C po install |
|
72 $(MAKE) -C help install |
|