]>
Commit | Line | Data |
---|---|---|
0731d691 | 1 | diff -aurN fbpanel-4.3.orig/config/default.cfg fbpanel-4.3/config/default.cfg |
2 | --- fbpanel-4.3.orig/config/default.cfg 2005-05-21 17:44:18.000000000 +0200 | |
3 | +++ fbpanel-4.3/config/default.cfg 2006-08-20 12:51:02.000000000 +0200 | |
4 | @@ -50,7 +50,7 @@ | |
5 | ||
6 | # # Identify panel window type as dock | |
7 | # # legal values are boolean | |
8 | -# SetDockTpe = true | |
9 | +# SetDockType = true | |
10 | ||
11 | # # Reserve panel's space so that it will not be covered by maximazied windows | |
12 | # # legal values are boolean | |
13 | @@ -126,11 +126,11 @@ | |
14 | type = menu | |
15 | config { | |
16 | # name = menu | |
17 | - image = PREFIX/share/fbpanel/images/Menu.png | |
18 | + image = /usr/share/fbpanel/images/Menu.png | |
19 | ||
20 | menu { | |
21 | name = Networking | |
22 | - image = PREFIX/share/fbpanel/images/Networking.png | |
23 | + image = /usr/share/fbpanel/images/Networking.png | |
24 | item { | |
25 | # image = | |
26 | name = mozilla | |
27 | @@ -147,19 +147,19 @@ | |
28 | } | |
29 | item { | |
30 | name = Configure | |
31 | - image = PREFIX/share/fbpanel/images/settings.png | |
32 | + image = /usr/share/fbpanel/images/settings.png | |
33 | command = configure | |
34 | } | |
35 | separator { | |
36 | } | |
37 | item { | |
38 | name = terminal | |
39 | - image = PREFIX/share/fbpanel/images/GNOME-Terminal.png | |
40 | + image = /usr/share/fbpanel/images/GNOME-Terminal.png | |
41 | action = xterm | |
42 | } | |
43 | item { | |
44 | name = emacs | |
45 | - image = PREFIX/share/fbpanel/images/Emacs.png | |
46 | + image = /usr/share/fbpanel/images/Emacs.png | |
47 | action = emacs | |
48 | } | |
49 | ||
50 | @@ -176,12 +176,12 @@ | |
51 | type = launchbar | |
52 | config { | |
53 | button { | |
54 | - image = PREFIX/share/fbpanel/images/GNOME-Terminal.png | |
55 | + image = /usr/share/fbpanel/images/GNOME-Terminal.png | |
56 | tooltip = Terminal | |
57 | action = xterm | |
58 | } | |
59 | button { | |
60 | - image = PREFIX/share/fbpanel/images/Emacs.png | |
61 | + image = /usr/share/fbpanel/images/Emacs.png | |
62 | tooltip = Emacs | |
63 | action = emacs | |
64 | } | |
65 | @@ -203,21 +203,21 @@ | |
66 | Plugin { | |
67 | type = icons | |
68 | config { | |
69 | - DefaultIcon = PREFIX/share/fbpanel/images/default.xpm | |
70 | + DefaultIcon = /usr/share/fbpanel/images/default.xpm | |
71 | application { | |
72 | - Image = PREFIX/share/fbpanel/images/GNOME-Terminal.png | |
73 | + Image = /usr/share/fbpanel/images/GNOME-Terminal.png | |
74 | ClassName = XTerm | |
75 | } | |
76 | application { | |
77 | - Image = PREFIX/share/fbpanel/images/GNOME-Terminal.png | |
78 | + Image = /usr/share/fbpanel/images/GNOME-Terminal.png | |
79 | ClassName = mlterm | |
80 | } | |
81 | application { | |
82 | - Image = PREFIX/share/fbpanel/images/GNOME-Terminal.png | |
83 | + Image = /usr/share/fbpanel/images/GNOME-Terminal.png | |
84 | ClassName = URxvt | |
85 | } | |
86 | application { | |
87 | - Image = PREFIX/share/fbpanel/images/Emacs.png | |
88 | + Image = /usr/share/fbpanel/images/Emacs.png | |
89 | AppName = emacs | |
90 | ClassName = Emacs | |
91 | } | |
92 | diff -aurN fbpanel-4.3.orig/config/Makefile fbpanel-4.3/config/Makefile | |
93 | --- fbpanel-4.3.orig/config/Makefile 2005-05-22 02:46:13.000000000 +0200 | |
94 | +++ fbpanel-4.3/config/Makefile 2006-08-20 12:52:23.000000000 +0200 | |
95 | @@ -17,11 +17,12 @@ | |
96 | ||
97 | ||
98 | install: | |
99 | - install -d $(PREFIX)/share/fbpanel | |
100 | - install -m 644 $(TARGET) $(PREFIX)/share/fbpanel | |
101 | - install -d $(PREFIX)/share/fbpanel/images | |
102 | - install -m 644 images/*.png $(PREFIX)/share/fbpanel/images | |
103 | - install -m 644 images/*.xpm $(PREFIX)/share/fbpanel/images | |
104 | + install -d $(DESTDIR)/etc/fbpanel | |
105 | + install -m 644 $(TARGET) $(DESTDIR)/etc/fbpanel | |
106 | + install -d $(DESTDIR)$(DATADIR)/fbpanel | |
107 | + install -d $(DESTDIR)$(DATADIR)/fbpanel/images | |
108 | + install -m 644 images/*.png $(DESTDIR)$(DATADIR)/fbpanel/images | |
109 | + install -m 644 images/*.xpm $(DESTDIR)$(DATADIR)/fbpanel/images | |
110 | ||
111 | uninstall: | |
112 | - $(RM) -r $(PREFIX)/share/fbpanel/images/ | |
113 | + $(RM) -r $(DATADIR)/fbpanel/images/ | |
4680640e | 114 | diff -aurN fbpanel-4.3.orig/Makefile fbpanel-4.3/Makefile |
115 | --- fbpanel-4.3.orig/Makefile 2005-05-31 16:55:50.000000000 +0200 | |
0731d691 | 116 | +++ fbpanel-4.3/Makefile 2006-08-20 12:48:23.000000000 +0200 |
4680640e | 117 | @@ -48,8 +48,8 @@ |
229d9b7d | 118 | $(RM) Makefile.config config.h |
119 | ||
120 | install: | |
121 | - install -d $(PREFIX)/bin | |
122 | - install -m 755 $(TARGET) $(PREFIX)/bin | |
123 | + install -d $(DESTDIR)$(PREFIX)/bin | |
124 | + install -m 755 $(TARGET) $(DESTDIR)$(PREFIX)/bin | |
125 | ||
126 | uninstall: | |
127 | $(RM) $(PREFIX)/bin/$(TARGET) | |
4680640e | 128 | diff -aurN fbpanel-4.3.orig/Makefile.common fbpanel-4.3/Makefile.common |
129 | --- fbpanel-4.3.orig/Makefile.common 2005-05-31 17:39:18.000000000 +0200 | |
0731d691 | 130 | +++ fbpanel-4.3/Makefile.common 2006-08-20 12:48:57.000000000 +0200 |
131 | @@ -85,11 +85,13 @@ | |
132 | RM = rm -f | |
133 | CC = gcc | |
134 | AR = ar | |
135 | -LIBS = $(shell pkg-config --libs gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0) -L/usr/X11R6/lib -lXmu | |
136 | +LIBS = $(shell pkg-config --libs gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0) -lXmu | |
229d9b7d | 137 | INCS2 = $(shell pkg-config --cflags gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0) |
138 | INCS := $(INCS2:-I%=-isystem %) | |
139 | ||
140 | -CFLAGS = -O2 | |
0731d691 | 141 | +LDFLAGS += -Wl,-export-dynamic |
142 | + | |
229d9b7d | 143 | +CFLAGS = $(OPTFLAGS) |
144 | ifeq (1,$(DEVEL)) | |
145 | override CFLAGS += -g | |
146 | endif | |
4680640e | 147 | diff -aurN fbpanel-4.3.orig/man/Makefile fbpanel-4.3/man/Makefile |
148 | --- fbpanel-4.3.orig/man/Makefile 2005-05-22 02:51:08.000000000 +0200 | |
0731d691 | 149 | +++ fbpanel-4.3/man/Makefile 2006-08-20 12:52:45.000000000 +0200 |
229d9b7d | 150 | @@ -17,8 +17,8 @@ |
2251be90 | 151 | |
152 | ||
153 | install: all | |
154 | - install -d $(PREFIX)/share/man/man1 | |
155 | - install -m 644 $(TARGET) $(PREFIX)/share/man/man1 | |
0731d691 | 156 | + install -d $(DESTDIR)$(DATADIR)/man/man1 |
157 | + install -m 644 $(TARGET) $(DESTDIR)$(DATADIR)/man/man1 | |
2251be90 | 158 | |
159 | uninstall: | |
0731d691 | 160 | - $(RM) $(PREFIX)/share/man/man1/$(TARGET) |
161 | + $(RM) $(DATADIR)/man/man1/$(TARGET) | |
4680640e | 162 | diff -aurN fbpanel-4.3.orig/plugins/Makefile fbpanel-4.3/plugins/Makefile |
163 | --- fbpanel-4.3.orig/plugins/Makefile 2005-05-31 17:45:06.000000000 +0200 | |
0731d691 | 164 | +++ fbpanel-4.3/plugins/Makefile 2006-08-20 12:48:23.000000000 +0200 |
4680640e | 165 | @@ -47,8 +47,8 @@ |
5f98ea4a | 166 | |
4680640e | 167 | ifeq (0,$(STATIC_PLUGINS)) |
5f98ea4a | 168 | install: |
169 | - install -d $(PREFIX)/share/fbpanel/plugins | |
170 | - install -m 644 $(SOBJ) $(PREFIX)/share/fbpanel/plugins | |
4680640e | 171 | + install -d $(DESTDIR)$(LIBDIR)/fbpanel/plugins |
117209e0 | 172 | + install -m 644 $(SOBJ) $(DESTDIR)$(LIBDIR)/fbpanel/plugins |
5f98ea4a | 173 | |
174 | uninstall: | |
4680640e | 175 | $(RM) -r $(PREFIX)/share/fbpanel/plugins/ |
176 | diff -aurN fbpanel-4.3.orig/systray/Makefile fbpanel-4.3/systray/Makefile | |
177 | --- fbpanel-4.3.orig/systray/Makefile 2005-05-31 17:31:27.000000000 +0200 | |
0731d691 | 178 | +++ fbpanel-4.3/systray/Makefile 2006-08-20 12:48:23.000000000 +0200 |
4680640e | 179 | @@ -41,8 +41,8 @@ |
5f98ea4a | 180 | |
4680640e | 181 | ifeq (0,$(STATIC_PLUGINS)) |
5f98ea4a | 182 | install: |
183 | - install -d $(PREFIX)/share/fbpanel/plugins | |
184 | - install -m 644 $(TARGET) $(PREFIX)/share/fbpanel/plugins | |
4680640e | 185 | + install -d $(DESTDIR)$(LIBDIR)/fbpanel/plugins |
117209e0 | 186 | + install -m 644 $(TARGET) $(DESTDIR)$(LIBDIR)/fbpanel/plugins |
5f98ea4a | 187 | |
188 | uninstall: | |
4680640e | 189 | $(RM) $(PREFIX)/share/fbpanel/plugins/$(TARGET) |