]>
Commit | Line | Data |
---|---|---|
3d1c5c7e | 1 | diff -ruN bluefish-0.9.orig/Makefile.in bluefish-0.9/Makefile.in |
2 | --- bluefish-0.9.orig/Makefile.in Wed Feb 19 23:39:25 2003 | |
3 | +++ bluefish-0.9/Makefile.in Wed Feb 19 23:45:25 2003 | |
4 | @@ -29,7 +29,7 @@ | |
5 | exec_prefix=@exec_prefix@ | |
6 | bindir=@bindir@ | |
7 | datadir=@datadir@ | |
8 | -pkgdatadir=$(datadir)/$(PACKAGE) | |
9 | +pkgdatadir=$(DESTDIR)/$(datadir)/$(PACKAGE) | |
10 | pixmapsdir=@prefix@/share/pixmaps | |
8ecac827 | 11 | |
3d1c5c7e | 12 | INSTALL = @INSTALL@ |
13 | @@ -64,12 +64,12 @@ | |
14 | rm -f *.orig *.rej | |
8ecac827 | 15 | |
3d1c5c7e | 16 | install: src/bluefish |
17 | - pkgdatadir=@pkgdatadir@ | |
18 | + pkgdatadir=$(DESTDIR)/@pkgdatadir@ | |
19 | $(INSTALL_DIR) $(pkgdatadir) | |
20 | $(INSTALL_DATA) images/bluefish_splash.png $(pkgdatadir) | |
21 | @cd icons/ && $(MAKE) install | |
22 | if [ -d /usr/share/pixmaps ]; then \ | |
23 | - $(INSTALL_DATA) inline_images/bluefish_icon1.png /usr/share/pixmaps/bluefish-icon.png ;\ | |
24 | + # $(INSTALL_DATA) inline_images/bluefish_icon1.png /usr/share/pixmaps/bluefish-icon.png ;\ | |
25 | fi | |
26 | @cd src/ && $(MAKE) install | |
27 | @cd po/ && $(MAKE) install | |
28 | diff -ruN bluefish-0.9.orig/data/Makefile.in bluefish-0.9/data/Makefile.in | |
29 | --- bluefish-0.9.orig/data/Makefile.in Wed Feb 19 23:39:25 2003 | |
30 | +++ bluefish-0.9/data/Makefile.in Wed Feb 19 23:43:55 2003 | |
31 | @@ -12,7 +12,7 @@ | |
32 | prefix = @prefix@ | |
33 | exec_prefix = @exec_prefix@ | |
34 | bindir = @bindir@ | |
35 | -pkgdatadir = @pkgdatadir@ | |
36 | +pkgdatadir = $(DESTDIR)/@pkgdatadir@ | |
37 | datadir = @datadir@ | |
38 | localedir = $(datadir)/locale | |
8ecac827 | 39 | |
3d1c5c7e | 40 | @@ -33,10 +33,10 @@ |
41 | $(INSTALL_DATA) $$file $(pkgdatadir)/$$file ;\ | |
42 | done | |
43 | if [ -d /usr/share/applications ] ; then \ | |
44 | - $(INSTALL_DATA) bluefish.desktop /usr/share/applications/ ;\ | |
45 | + $(INSTALL_DATA) bluefish.desktop $(DESTDIR)/usr/share/applications/ ;\ | |
46 | fi | |
47 | if [ -d /usr/share/gnome/apps/Applications ] ; then \ | |
48 | - $(INSTALL_DATA) bluefish.desktop /usr/share/gnome/apps/Applications ;\ | |
49 | + $(INSTALL_DATA) bluefish.desktop $(DESTDIR)/usr/share/gnome/apps/Applications ;\ | |
50 | fi | |
85bc3747 | 51 | |
52 | uninstall: | |
3d1c5c7e | 53 | diff -ruN bluefish-0.9.orig/icons/Makefile.in bluefish-0.9/icons/Makefile.in |
54 | --- bluefish-0.9.orig/icons/Makefile.in Wed Feb 19 23:39:25 2003 | |
55 | +++ bluefish-0.9/icons/Makefile.in Wed Feb 19 23:42:52 2003 | |
56 | @@ -22,7 +22,7 @@ | |
57 | prefix = @prefix@ | |
58 | exec_prefix = @exec_prefix@ | |
59 | bindir = @bindir@ | |
60 | -pkgdatadir = @pkgdatadir@ | |
61 | +pkgdatadir = $(DESTDIR)/@pkgdatadir@ | |
85bc3747 | 62 | |
3d1c5c7e | 63 | infodir = $(prefix)/info |
64 | libdir = $(prefix)/lib/gnudl | |
65 | diff -ruN bluefish-0.9.orig/po/Makefile.in bluefish-0.9/po/Makefile.in | |
66 | --- bluefish-0.9.orig/po/Makefile.in Wed Feb 19 23:39:24 2003 | |
67 | +++ bluefish-0.9/po/Makefile.in Wed Feb 19 23:45:52 2003 | |
68 | @@ -14,7 +14,7 @@ | |
69 | bindir = @bindir@ | |
70 | pkgdatadir = @pkgdatadir@ | |
71 | datadir = @datadir@ | |
72 | -localedir = $(datadir)/locale | |
73 | +localedir = $(DESTDIR)/$(datadir)/locale | |
85bc3747 | 74 | |
3d1c5c7e | 75 | INSTALL = @INSTALL@ |
76 | INSTALL_DIR = $(INSTALL) -d -m 755 | |
77 | diff -ruN bluefish-0.9.orig/src/Makefile.in bluefish-0.9/src/Makefile.in | |
78 | --- bluefish-0.9.orig/src/Makefile.in Wed Feb 19 23:39:25 2003 | |
79 | +++ bluefish-0.9/src/Makefile.in Wed Feb 19 23:44:37 2003 | |
80 | @@ -21,7 +21,7 @@ | |
81 | srcdir = @srcdir@ | |
82 | prefix = @prefix@ | |
83 | exec_prefix = @exec_prefix@ | |
84 | -bindir = @bindir@ | |
85 | +bindir = $(DESTDIR)/@bindir@ | |
86 | pkgdatadir = @pkgdatadir@ | |
8ecac827 | 87 | |
3d1c5c7e | 88 | infodir = $(prefix)/info |
89 | --- bluefish-0.9/Makefile.in~ Thu Feb 20 00:29:51 2003 | |
90 | +++ bluefish-0.9/Makefile.in Thu Feb 20 00:32:12 2003 | |
91 | @@ -68,9 +68,9 @@ | |
92 | $(INSTALL_DIR) $(pkgdatadir) | |
93 | $(INSTALL_DATA) images/bluefish_splash.png $(pkgdatadir) | |
94 | @cd icons/ && $(MAKE) install | |
95 | - if [ -d /usr/share/pixmaps ]; then \ | |
96 | +# if [ -d /usr/share/pixmaps ]; then \ | |
97 | # $(INSTALL_DATA) inline_images/bluefish_icon1.png /usr/share/pixmaps/bluefish-icon.png ;\ | |
98 | - fi | |
99 | +# fi | |
100 | @cd src/ && $(MAKE) install | |
101 | @cd po/ && $(MAKE) install | |
102 | @cd data/ && $(MAKE) install |