fbpanel-build_fixes.patch

   1 diff -aurN fbpanel-4.3.orig/Makefile fbpanel-4.3/Makefile
   2 --- fbpanel-4.3.orig/Makefile   2005-05-31 16:55:50.000000000 +0200
   3 +++ fbpanel-4.3/Makefile        2005-06-01 09:44:55.000000000 +0200
   4 @@ -48,8 +48,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.3.orig/Makefile.common fbpanel-4.3/Makefile.common
  16 --- fbpanel-4.3.orig/Makefile.common    2005-05-31 17:39:18.000000000 +0200
  17 +++ fbpanel-4.3/Makefile.common 2005-06-01 09:44:13.000000000 +0200
  18 @@ -89,7 +89,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.3.orig/config/Makefile fbpanel-4.3/config/Makefile
  28 --- fbpanel-4.3.orig/config/Makefile    2005-05-22 02:46:13.000000000 +0200
  29 +++ fbpanel-4.3/config/Makefile 2005-06-01 09:52:49.000000000 +0200
  30 @@ -17,11 +17,12 @@
  31
  32
  33  install:
  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
  45
  46  uninstall:
  47         $(RM) -r $(PREFIX)/share/fbpanel/images/
  48 diff -aurN fbpanel-4.3.orig/man/Makefile fbpanel-4.3/man/Makefile
  49 --- fbpanel-4.3.orig/man/Makefile       2005-05-22 02:51:08.000000000 +0200
  50 +++ fbpanel-4.3/man/Makefile    2005-06-01 09:46:59.000000000 +0200
  51 @@ -17,8 +17,8 @@
  52
  53
  54  install: all
  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
  59
  60  uninstall:
  61         $(RM) $(PREFIX)/share/man/man1/$(TARGET)
  62 diff -aurN fbpanel-4.3.orig/panel.c fbpanel-4.3/panel.c
  63 --- fbpanel-4.3.orig/panel.c    2005-05-08 09:46:40.000000000 +0200
  64 +++ fbpanel-4.3/panel.c 2005-06-01 09:50:58.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) {
  76 diff -aurN fbpanel-4.3.orig/plugin.c fbpanel-4.3/plugin.c
  77 --- fbpanel-4.3.orig/plugin.c   2005-05-29 06:02:03.000000000 +0200
  78 +++ fbpanel-4.3/plugin.c        2005-06-01 09:49:53.000000000 +0200
  79 @@ -137,7 +137,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.3.orig/plugins/Makefile fbpanel-4.3/plugins/Makefile
  89 --- fbpanel-4.3.orig/plugins/Makefile   2005-05-31 17:45:06.000000000 +0200
  90 +++ fbpanel-4.3/plugins/Makefile        2005-06-01 09:48:12.000000000 +0200
  91 @@ -47,8 +47,8 @@
  92
  93  ifeq (0,$(STATIC_PLUGINS))
  94  install:
  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
  99
 100  uninstall:
 101         $(RM) -r $(PREFIX)/share/fbpanel/plugins/
 102 diff -aurN fbpanel-4.3.orig/systray/Makefile fbpanel-4.3/systray/Makefile
 103 --- fbpanel-4.3.orig/systray/Makefile   2005-05-31 17:31:27.000000000 +0200
 104 +++ fbpanel-4.3/systray/Makefile        2005-06-01 09:49:08.000000000 +0200
 105 @@ -41,8 +41,8 @@
 106
 107  ifeq (0,$(STATIC_PLUGINS))
 108  install:
 109 -       install -d  $(PREFIX)/share/fbpanel/plugins
 110 -       install -m 644 $(TARGET) $(PREFIX)/share/fbpanel/plugins
 111 +       install -d $(DESTDIR)$(LIBDIR)/fbpanel/plugins
 112 +       install -m 644 $(TARGET) $(DESTDIR)$(LIBDIR)/fbpanel/plugins
 113
 114  uninstall:
 115         $(RM) $(PREFIX)/share/fbpanel/plugins/$(TARGET)