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
6 # # Identify panel window type as dock
7 # # legal values are boolean
11 # # Reserve panel's space so that it will not be covered by maximazied windows
12 # # legal values are boolean
17 - image = PREFIX/share/fbpanel/images/Menu.png
18 + image = /usr/share/fbpanel/images/Menu.png
22 - image = PREFIX/share/fbpanel/images/Networking.png
23 + image = /usr/share/fbpanel/images/Networking.png
31 - image = PREFIX/share/fbpanel/images/settings.png
32 + image = /usr/share/fbpanel/images/settings.png
39 - image = PREFIX/share/fbpanel/images/GNOME-Terminal.png
40 + image = /usr/share/fbpanel/images/GNOME-Terminal.png
45 - image = PREFIX/share/fbpanel/images/Emacs.png
46 + image = /usr/share/fbpanel/images/Emacs.png
54 - image = PREFIX/share/fbpanel/images/GNOME-Terminal.png
55 + image = /usr/share/fbpanel/images/GNOME-Terminal.png
60 - image = PREFIX/share/fbpanel/images/Emacs.png
61 + image = /usr/share/fbpanel/images/Emacs.png
69 - DefaultIcon = PREFIX/share/fbpanel/images/default.xpm
70 + DefaultIcon = /usr/share/fbpanel/images/default.xpm
72 - Image = PREFIX/share/fbpanel/images/GNOME-Terminal.png
73 + Image = /usr/share/fbpanel/images/GNOME-Terminal.png
77 - Image = PREFIX/share/fbpanel/images/GNOME-Terminal.png
78 + Image = /usr/share/fbpanel/images/GNOME-Terminal.png
82 - Image = PREFIX/share/fbpanel/images/GNOME-Terminal.png
83 + Image = /usr/share/fbpanel/images/GNOME-Terminal.png
87 - Image = PREFIX/share/fbpanel/images/Emacs.png
88 + Image = /usr/share/fbpanel/images/Emacs.png
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
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
112 - $(RM) -r $(PREFIX)/share/fbpanel/images/
113 + $(RM) -r $(DATADIR)/fbpanel/images/
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
116 +++ fbpanel-4.3/Makefile 2006-08-20 12:48:23.000000000 +0200
118 $(RM) Makefile.config config.h
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
127 $(RM) $(PREFIX)/bin/$(TARGET)
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
130 +++ fbpanel-4.3/Makefile.common 2006-08-20 12:48:57.000000000 +0200
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
137 INCS2 = $(shell pkg-config --cflags gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0)
138 INCS := $(INCS2:-I%=-isystem %)
141 +LDFLAGS += -Wl,-export-dynamic
143 +CFLAGS = $(OPTFLAGS)
145 override CFLAGS += -g
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
149 +++ fbpanel-4.3/man/Makefile 2006-08-20 12:52:45.000000000 +0200
154 - install -d $(PREFIX)/share/man/man1
155 - install -m 644 $(TARGET) $(PREFIX)/share/man/man1
156 + install -d $(DESTDIR)$(DATADIR)/man/man1
157 + install -m 644 $(TARGET) $(DESTDIR)$(DATADIR)/man/man1
160 - $(RM) $(PREFIX)/share/man/man1/$(TARGET)
161 + $(RM) $(DATADIR)/man/man1/$(TARGET)
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
164 +++ fbpanel-4.3/plugins/Makefile 2006-08-20 12:48:23.000000000 +0200
167 ifeq (0,$(STATIC_PLUGINS))
169 - install -d $(PREFIX)/share/fbpanel/plugins
170 - install -m 644 $(SOBJ) $(PREFIX)/share/fbpanel/plugins
171 + install -d $(DESTDIR)$(LIBDIR)/fbpanel/plugins
172 + install -m 644 $(SOBJ) $(DESTDIR)$(LIBDIR)/fbpanel/plugins
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
178 +++ fbpanel-4.3/systray/Makefile 2006-08-20 12:48:23.000000000 +0200
181 ifeq (0,$(STATIC_PLUGINS))
183 - install -d $(PREFIX)/share/fbpanel/plugins
184 - install -m 644 $(TARGET) $(PREFIX)/share/fbpanel/plugins
185 + install -d $(DESTDIR)$(LIBDIR)/fbpanel/plugins
186 + install -m 644 $(TARGET) $(DESTDIR)$(LIBDIR)/fbpanel/plugins
189 $(RM) $(PREFIX)/share/fbpanel/plugins/$(TARGET)