1 diff -aurN fbpanel-4.2.orig/Makefile fbpanel-4.2/Makefile
2 --- fbpanel-4.2.orig/Makefile 2005-05-22 05:20:21.000000000 +0200
3 +++ fbpanel-4.2/Makefile 2005-05-26 12:45:43.000000000 +0200
5 $(RM) Makefile.config config.h
8 - install -d $(PREFIX)/bin
9 - install -m 755 $(TARGET) $(PREFIX)/bin
10 + install -d $(DESTDIR)$(PREFIX)/bin
11 + install -m 755 $(TARGET) $(DESTDIR)$(PREFIX)/bin
14 $(RM) $(PREFIX)/bin/$(TARGET)
15 diff -aurN fbpanel-4.2.orig/Makefile.common fbpanel-4.2/Makefile.common
16 --- fbpanel-4.2.orig/Makefile.common 2005-05-22 05:23:39.000000000 +0200
17 +++ fbpanel-4.2/Makefile.common 2005-05-26 12:45:43.000000000 +0200
19 INCS2 = $(shell pkg-config --cflags gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0)
20 INCS := $(INCS2:-I%=-isystem %)
27 diff -aurN fbpanel-4.2.orig/config/Makefile fbpanel-4.2/config/Makefile
28 --- fbpanel-4.2.orig/config/Makefile 2005-05-22 02:46:13.000000000 +0200
29 +++ fbpanel-4.2/config/Makefile 2005-05-26 13:09:07.000000000 +0200
34 - install -d $(PREFIX)/share/fbpanel
35 - install -m 644 $(TARGET) $(PREFIX)/share/fbpanel
36 - install -d $(PREFIX)/share/fbpanel/images
37 - install -m 644 images/*.png $(PREFIX)/share/fbpanel/images
38 - install -m 644 images/*.xpm $(PREFIX)/share/fbpanel/images
39 + install -d $(DESTDIR)/etc/fbpanel
40 + install -m 644 $(TARGET) $(DESTDIR)/etc/fbpanel
41 + install -d $(DESTDIR)$(PREFIX)/share/fbpanel
42 + install -d $(DESTDIR)$(PREFIX)/share/fbpanel/images
43 + install -m 644 images/*.png $(DESTDIR)$(PREFIX)/share/fbpanel/images
44 + install -m 644 images/*.xpm $(DESTDIR)$(PREFIX)/share/fbpanel/images
47 $(RM) -r $(PREFIX)/share/fbpanel/images/
48 diff -aurN fbpanel-4.2.orig/man/Makefile fbpanel-4.2/man/Makefile
49 --- fbpanel-4.2.orig/man/Makefile 2005-05-22 02:51:08.000000000 +0200
50 +++ fbpanel-4.2/man/Makefile 2005-05-26 12:45:43.000000000 +0200
55 - install -d $(PREFIX)/share/man/man1
56 - install -m 644 $(TARGET) $(PREFIX)/share/man/man1
57 + install -d $(DESTDIR)$(PREFIX)/share/man/man1
58 + install -m 644 $(TARGET) $(DESTDIR)$(PREFIX)/share/man/man1
61 $(RM) $(PREFIX)/share/man/man1/$(TARGET)
62 diff -aurN fbpanel-4.2.orig/panel.c fbpanel-4.2/panel.c
63 --- fbpanel-4.2.orig/panel.c 2005-05-08 09:46:40.000000000 +0200
64 +++ fbpanel-4.2/panel.c 2005-05-26 12:57:48.000000000 +0200
66 //ERR("Can't load %s\n", fname);
69 - /* check private configuration directory */
70 - fname = g_strdup_printf("%s/share/fbpanel/%s", PREFIX, profile);
71 + /* check system-wide configuration directory */
72 + fname = g_strdup_printf("/etc/fbpanel/%s", profile);
73 fp = fopen(fname, "r");
74 LOG(LOG_INFO, " %s %s\n", fname, fp ? "ok" : "no");
76 diff -aurN fbpanel-4.2.orig/plugin.c fbpanel-4.2/plugin.c
77 --- fbpanel-4.2.orig/plugin.c 2005-05-21 07:08:52.000000000 +0200
78 +++ fbpanel-4.2/plugin.c 2005-05-26 12:44:58.000000000 +0200
80 //LOG(LOG_INFO, " %s ... %s\n", str->str, m ? "ok" : "no");
82 DBG("error is %s\n", g_module_error());
83 - g_string_printf(str, "%s/share/fbpanel/plugins/%s.so", PREFIX, type);
84 + g_string_printf(str, "%s/lib/fbpanel/plugins/%s.so", PREFIX, type);
85 m = g_module_open(str->str, G_MODULE_BIND_LAZY);
86 //LOG(LOG_INFO, " %s ... %s\n", str->str, m ? "ok" : "no");
88 diff -aurN fbpanel-4.2.orig/plugins/Makefile fbpanel-4.2/plugins/Makefile
89 --- fbpanel-4.2.orig/plugins/Makefile 2005-05-22 05:21:16.000000000 +0200
90 +++ fbpanel-4.2/plugins/Makefile 2005-05-26 12:45:43.000000000 +0200
95 - install -d $(PREFIX)/share/fbpanel/plugins
96 - install -m 644 $(SOBJ) $(PREFIX)/share/fbpanel/plugins
97 + install -d $(DESTDIR)$(LIBDIR)/fbpanel/plugins
98 + install -m 644 $(SOBJ) $(DESTDIR)$(LIBDIR)/fbpanel/plugins
101 - $(RM) -r $(PREFIX)/share/fbpanel/plugins/
102 + $(RM) -r $(LIBDIR)/fbpanel/plugins/
104 diff -aurN fbpanel-4.2.orig/systray/Makefile fbpanel-4.2/systray/Makefile
105 --- fbpanel-4.2.orig/systray/Makefile 2005-05-22 05:20:58.000000000 +0200
106 +++ fbpanel-4.2/systray/Makefile 2005-05-26 12:45:43.000000000 +0200
111 - install -d $(PREFIX)/share/fbpanel/plugins
112 - install -m 644 $(TARGET) $(PREFIX)/share/fbpanel/plugins
113 + install -d $(DESTDIR)$(LIBDIR)/fbpanel/plugins
114 + install -m 644 $(TARGET) $(DESTDIR)$(LIBDIR)/fbpanel/plugins
117 - $(RM) $(PREFIX)/share/fbpanel/plugins/$(TARGET)
118 + $(RM) $(LIBDIR)/fbpanel/plugins/$(TARGET)