[packages/fbpanel.git] / fbpanel-build_fixes.patch

diff -aurN fbpanel-4.2.orig/Makefile fbpanel-4.2/Makefile
--- fbpanel-4.2.orig/Makefile	2005-05-22 05:20:21.000000000 +0200
+++ fbpanel-4.2/Makefile	2005-05-26 12:45:43.000000000 +0200
@@ -50,8 +50,8 @@
 	$(RM) Makefile.config config.h
 
 install: 
-	install -d $(PREFIX)/bin
-	install -m 755 $(TARGET) $(PREFIX)/bin
+	install -d $(DESTDIR)$(PREFIX)/bin
+	install -m 755 $(TARGET) $(DESTDIR)$(PREFIX)/bin
 
 uninstall:
 	$(RM) $(PREFIX)/bin/$(TARGET)
diff -aurN fbpanel-4.2.orig/Makefile.common fbpanel-4.2/Makefile.common
--- fbpanel-4.2.orig/Makefile.common	2005-05-22 05:23:39.000000000 +0200
+++ fbpanel-4.2/Makefile.common	2005-05-26 12:45:43.000000000 +0200
@@ -87,7 +87,7 @@
 INCS2   = $(shell pkg-config --cflags gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0)
 INCS   := $(INCS2:-I%=-isystem %)
 
-CFLAGS = -O2
+CFLAGS = $(OPTFLAGS)
 ifeq (1,$(DEVEL))
 override CFLAGS += -g
 endif
diff -aurN fbpanel-4.2.orig/config/Makefile fbpanel-4.2/config/Makefile
--- fbpanel-4.2.orig/config/Makefile	2005-05-22 02:46:13.000000000 +0200
+++ fbpanel-4.2/config/Makefile	2005-05-26 13:09:07.000000000 +0200
@@ -17,11 +17,12 @@
 
 
 install: 
-	install -d  $(PREFIX)/share/fbpanel
-	install -m 644 $(TARGET) $(PREFIX)/share/fbpanel
-	install -d  $(PREFIX)/share/fbpanel/images
-	install -m 644 images/*.png $(PREFIX)/share/fbpanel/images
-	install -m 644 images/*.xpm $(PREFIX)/share/fbpanel/images
+	install -d  $(DESTDIR)/etc/fbpanel
+	install -m 644 $(TARGET) $(DESTDIR)/etc/fbpanel
+	install -d  $(DESTDIR)$(PREFIX)/share/fbpanel
+	install -d  $(DESTDIR)$(PREFIX)/share/fbpanel/images
+	install -m 644 images/*.png $(DESTDIR)$(PREFIX)/share/fbpanel/images
+	install -m 644 images/*.xpm $(DESTDIR)$(PREFIX)/share/fbpanel/images
 
 uninstall:
 	$(RM) -r $(PREFIX)/share/fbpanel/images/
diff -aurN fbpanel-4.2.orig/man/Makefile fbpanel-4.2/man/Makefile
--- fbpanel-4.2.orig/man/Makefile	2005-05-22 02:51:08.000000000 +0200
+++ fbpanel-4.2/man/Makefile	2005-05-26 12:45:43.000000000 +0200
@@ -17,8 +17,8 @@
 
 
 install: all
-	install -d  $(PREFIX)/share/man/man1
-	install -m 644 $(TARGET) $(PREFIX)/share/man/man1
+	install -d  $(DESTDIR)$(PREFIX)/share/man/man1
+	install -m 644 $(TARGET) $(DESTDIR)$(PREFIX)/share/man/man1
 
 uninstall:
 	$(RM) $(PREFIX)/share/man/man1/$(TARGET)
diff -aurN fbpanel-4.2.orig/panel.c fbpanel-4.2/panel.c
--- fbpanel-4.2.orig/panel.c	2005-05-08 09:46:40.000000000 +0200
+++ fbpanel-4.2/panel.c	2005-05-26 12:57:48.000000000 +0200
@@ -706,8 +706,8 @@
     //ERR("Can't load %s\n", fname);
     g_free(fname);
     
-    /* check private configuration directory */
-    fname = g_strdup_printf("%s/share/fbpanel/%s", PREFIX, profile);
+    /* check system-wide configuration directory */
+    fname = g_strdup_printf("/etc/fbpanel/%s", profile);
     fp = fopen(fname, "r");
     LOG(LOG_INFO, "   %s %s\n", fname, fp ? "ok" : "no");
     if (fp) {
diff -aurN fbpanel-4.2.orig/plugin.c fbpanel-4.2/plugin.c
--- fbpanel-4.2.orig/plugin.c	2005-05-21 07:08:52.000000000 +0200
+++ fbpanel-4.2/plugin.c	2005-05-26 12:44:58.000000000 +0200
@@ -133,7 +133,7 @@
         //LOG(LOG_INFO, "   %s ... %s\n", str->str, m ? "ok" : "no");
         if (!m) {
             DBG("error is %s\n", g_module_error());
-            g_string_printf(str, "%s/share/fbpanel/plugins/%s.so", PREFIX, type);
+            g_string_printf(str, "%s/lib/fbpanel/plugins/%s.so", PREFIX, type);
             m = g_module_open(str->str, G_MODULE_BIND_LAZY);
             //LOG(LOG_INFO, "   %s ... %s\n", str->str, m ? "ok" : "no");
             if (!m) {
diff -aurN fbpanel-4.2.orig/plugins/Makefile fbpanel-4.2/plugins/Makefile
--- fbpanel-4.2.orig/plugins/Makefile	2005-05-22 05:21:16.000000000 +0200
+++ fbpanel-4.2/plugins/Makefile	2005-05-26 12:45:43.000000000 +0200
@@ -39,9 +39,9 @@
 
 
 install: 
-	install -d  $(PREFIX)/share/fbpanel/plugins
-	install -m 644 $(SOBJ) $(PREFIX)/share/fbpanel/plugins
+	install -d  $(DESTDIR)$(LIBDIR)/fbpanel/plugins
+	install -m 644 $(SOBJ) $(DESTDIR)$(LIBDIR)/fbpanel/plugins
 
 uninstall:
-	$(RM) -r $(PREFIX)/share/fbpanel/plugins/
+	$(RM) -r $(LIBDIR)/fbpanel/plugins/
 
diff -aurN fbpanel-4.2.orig/systray/Makefile fbpanel-4.2/systray/Makefile
--- fbpanel-4.2.orig/systray/Makefile	2005-05-22 05:20:58.000000000 +0200
+++ fbpanel-4.2/systray/Makefile	2005-05-26 12:45:43.000000000 +0200
@@ -30,9 +30,9 @@
 
 
 install: 
-	install -d  $(PREFIX)/share/fbpanel/plugins
-	install -m 644 $(TARGET) $(PREFIX)/share/fbpanel/plugins
+	install -d  $(DESTDIR)$(LIBDIR)/fbpanel/plugins
+	install -m 644 $(TARGET) $(DESTDIR)$(LIBDIR)/fbpanel/plugins
 
 uninstall:
-	$(RM) $(PREFIX)/share/fbpanel/plugins/$(TARGET)
+	$(RM) $(LIBDIR)/fbpanel/plugins/$(TARGET)
Commit	Line	Data
229d9b7d	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
	4	@@ -50,8 +50,8 @@
	5	$(RM) Makefile.config config.h
	6
	7	install:
	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
	12
	13	uninstall:
	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
	18	@@ -87,7 +87,7 @@
	19	INCS2 = $(shell pkg-config --cflags gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0)
	20	INCS := $(INCS2:-I%=-isystem %)
	21
	22	-CFLAGS = -O2
	23	+CFLAGS = $(OPTFLAGS)
	24	ifeq (1,$(DEVEL))
	25	override CFLAGS += -g
	26	endif
	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
e3a599a4	29	+++ fbpanel-4.2/config/Makefile 2005-05-26 13:09:07.000000000 +0200
e3a599a4	30	@@ -17,11 +17,12 @@
229d9b7d	31
2251be90	32
	33	install:
	34	- install -d $(PREFIX)/share/fbpanel
229d9b7d	35	- install -m 644 $(TARGET) $(PREFIX)/share/fbpanel
2251be90	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
e3a599a4	39	+ install -d $(DESTDIR)/etc/fbpanel
e3a599a4	40	+ install -m 644 $(TARGET) $(DESTDIR)/etc/fbpanel
2251be90	41	+ install -d $(DESTDIR)$(PREFIX)/share/fbpanel
2251be90	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
5f98ea4a	45
2251be90	46	uninstall:
229d9b7d	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
	51	@@ -17,8 +17,8 @@
2251be90	52
	53
	54	install: all
	55	- install -d $(PREFIX)/share/man/man1
	56	- install -m 644 $(TARGET) $(PREFIX)/share/man/man1
5f98ea4a	57	+ install -d $(DESTDIR)$(PREFIX)/share/man/man1
5f98ea4a	58	+ install -m 644 $(TARGET) $(DESTDIR)$(PREFIX)/share/man/man1
2251be90	59
2251be90	60	uninstall:
229d9b7d	61	$(RM) $(PREFIX)/share/man/man1/$(TARGET)
e3a599a4	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
	65	@@ -706,8 +706,8 @@
	66	//ERR("Can't load %s\n", fname);
	67	g_free(fname);
	68
	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");
	75	if (fp) {
229d9b7d	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
	79	@@ -133,7 +133,7 @@
	80	//LOG(LOG_INFO, " %s ... %s\n", str->str, m ? "ok" : "no");
	81	if (!m) {
	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");
	87	if (!m) {
	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
	91	@@ -39,9 +39,9 @@
	92
5f98ea4a	93
	94	install:
	95	- install -d $(PREFIX)/share/fbpanel/plugins
	96	- install -m 644 $(SOBJ) $(PREFIX)/share/fbpanel/plugins
117209e0	97	+ install -d $(DESTDIR)$(LIBDIR)/fbpanel/plugins
117209e0	98	+ install -m 644 $(SOBJ) $(DESTDIR)$(LIBDIR)/fbpanel/plugins
5f98ea4a	99
5f98ea4a	100	uninstall:
229d9b7d	101	- $(RM) -r $(PREFIX)/share/fbpanel/plugins/
229d9b7d	102	+ $(RM) -r $(LIBDIR)/fbpanel/plugins/
494c07e8	103
229d9b7d	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
	107	@@ -30,9 +30,9 @@
5f98ea4a	108
	109
	110	install:
	111	- install -d $(PREFIX)/share/fbpanel/plugins
	112	- install -m 644 $(TARGET) $(PREFIX)/share/fbpanel/plugins
117209e0	113	+ install -d $(DESTDIR)$(LIBDIR)/fbpanel/plugins
117209e0	114	+ install -m 644 $(TARGET) $(DESTDIR)$(LIBDIR)/fbpanel/plugins
5f98ea4a	115
5f98ea4a	116	uninstall:
229d9b7d	117	- $(RM) $(PREFIX)/share/fbpanel/plugins/$(TARGET)
229d9b7d	118	+ $(RM) $(LIBDIR)/fbpanel/plugins/$(TARGET)
494c07e8	119