fbpanel-build_fixes.patch

   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
  29 +++ fbpanel-4.2/config/Makefile 2005-05-26 12:45:43.000000000 +0200
  30 @@ -17,11 +17,11 @@
  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)$(PREFIX)/share/fbpanel
  40 +       install -m 644 $(TARGET) $(DESTDIR)$(PREFIX)/share/fbpanel
  41 +       install -d  $(DESTDIR)$(PREFIX)/share/fbpanel/images
  42 +       install -m 644 images/*.png $(DESTDIR)$(PREFIX)/share/fbpanel/images
  43 +       install -m 644 images/*.xpm $(DESTDIR)$(PREFIX)/share/fbpanel/images
  44
  45  uninstall:
  46         $(RM) -r $(PREFIX)/share/fbpanel/images/
  47 diff -aurN fbpanel-4.2.orig/man/Makefile fbpanel-4.2/man/Makefile
  48 --- fbpanel-4.2.orig/man/Makefile       2005-05-22 02:51:08.000000000 +0200
  49 +++ fbpanel-4.2/man/Makefile    2005-05-26 12:45:43.000000000 +0200
  50 @@ -17,8 +17,8 @@
  51
  52
  53  install: all
  54 -       install -d  $(PREFIX)/share/man/man1
  55 -       install -m 644 $(TARGET) $(PREFIX)/share/man/man1
  56 +       install -d  $(DESTDIR)$(PREFIX)/share/man/man1
  57 +       install -m 644 $(TARGET) $(DESTDIR)$(PREFIX)/share/man/man1
  58
  59  uninstall:
  60         $(RM) $(PREFIX)/share/man/man1/$(TARGET)
  61 diff -aurN fbpanel-4.2.orig/plugin.c fbpanel-4.2/plugin.c
  62 --- fbpanel-4.2.orig/plugin.c   2005-05-21 07:08:52.000000000 +0200
  63 +++ fbpanel-4.2/plugin.c        2005-05-26 12:44:58.000000000 +0200
  64 @@ -133,7 +133,7 @@
  65          //LOG(LOG_INFO, "   %s ... %s\n", str->str, m ? "ok" : "no");
  66          if (!m) {
  67              DBG("error is %s\n", g_module_error());
  68 -            g_string_printf(str, "%s/share/fbpanel/plugins/%s.so", PREFIX, type);
  69 +            g_string_printf(str, "%s/lib/fbpanel/plugins/%s.so", PREFIX, type);
  70              m = g_module_open(str->str, G_MODULE_BIND_LAZY);
  71              //LOG(LOG_INFO, "   %s ... %s\n", str->str, m ? "ok" : "no");
  72              if (!m) {
  73 diff -aurN fbpanel-4.2.orig/plugins/Makefile fbpanel-4.2/plugins/Makefile
  74 --- fbpanel-4.2.orig/plugins/Makefile   2005-05-22 05:21:16.000000000 +0200
  75 +++ fbpanel-4.2/plugins/Makefile        2005-05-26 12:45:43.000000000 +0200
  76 @@ -39,9 +39,9 @@
  77
  78
  79  install:
  80 -       install -d  $(PREFIX)/share/fbpanel/plugins
  81 -       install -m 644 $(SOBJ) $(PREFIX)/share/fbpanel/plugins
  82 +       install -d  $(DESTDIR)$(LIBDIR)/fbpanel/plugins
  83 +       install -m 644 $(SOBJ) $(DESTDIR)$(LIBDIR)/fbpanel/plugins
  84
  85  uninstall:
  86 -       $(RM) -r $(PREFIX)/share/fbpanel/plugins/
  87 +       $(RM) -r $(LIBDIR)/fbpanel/plugins/
  88
  89 diff -aurN fbpanel-4.2.orig/systray/Makefile fbpanel-4.2/systray/Makefile
  90 --- fbpanel-4.2.orig/systray/Makefile   2005-05-22 05:20:58.000000000 +0200
  91 +++ fbpanel-4.2/systray/Makefile        2005-05-26 12:45:43.000000000 +0200
  92 @@ -30,9 +30,9 @@
  93
  94
  95  install:
  96 -       install -d  $(PREFIX)/share/fbpanel/plugins
  97 -       install -m 644 $(TARGET) $(PREFIX)/share/fbpanel/plugins
  98 +       install -d  $(DESTDIR)$(LIBDIR)/fbpanel/plugins
  99 +       install -m 644 $(TARGET) $(DESTDIR)$(LIBDIR)/fbpanel/plugins
 100
 101  uninstall:
 102 -       $(RM) $(PREFIX)/share/fbpanel/plugins/$(TARGET)
 103 +       $(RM) $(LIBDIR)/fbpanel/plugins/$(TARGET)
 104