fbpanel-build_fixes.patch

   1 diff -aurN fbpanel-4.1.orig/config/Makefile fbpanel-4.1/config/Makefile
   2 --- fbpanel-4.1.orig/config/Makefile    2004-04-23 03:20:51.000000000 +0200
   3 +++ fbpanel-4.1/config/Makefile 2005-05-02 19:05:40.000000000 +0200
   4 @@ -18,11 +18,11 @@
   5         $(RM) $(RES) *~
   6
   7  install:
   8 -       install -d  $(PREFIX)/share/fbpanel
   9 -       install -m 644 $(RES) $(PREFIX)/share/fbpanel
  10 -       install -d  $(PREFIX)/share/fbpanel/images
  11 -       install -m 644 images/*.png $(PREFIX)/share/fbpanel/images
  12 -       install -m 644 images/*.xpm $(PREFIX)/share/fbpanel/images
  13 +       install -d  $(DESTDIR)$(PREFIX)/share/fbpanel
  14 +       install -m 644 $(RES) $(DESTDIR)$(PREFIX)/share/fbpanel
  15 +       install -d  $(DESTDIR)$(PREFIX)/share/fbpanel/images
  16 +       install -m 644 images/*.png $(DESTDIR)$(PREFIX)/share/fbpanel/images
  17 +       install -m 644 images/*.xpm $(DESTDIR)$(PREFIX)/share/fbpanel/images
  18
  19  uninstall:
  20         rm -rf $(PREFIX)/share/fbpanel
  21 diff -aurN fbpanel-4.1.orig/Makefile fbpanel-4.1/Makefile
  22 --- fbpanel-4.1.orig/Makefile   2004-12-18 20:31:59.000000000 +0100
  23 +++ fbpanel-4.1/Makefile        2005-05-02 19:05:40.000000000 +0200
  24 @@ -55,8 +55,8 @@
  25         rm -f Makefile.config config.h
  26
  27  install:
  28 -       install -d $(PREFIX)/bin
  29 -       install -m 755 $(TARGET) $(PREFIX)/bin
  30 +       install -d $(DESTDIR)$(PREFIX)/bin
  31 +       install -m 755 $(TARGET) $(DESTDIR)$(PREFIX)/bin
  32
  33  uninstall:
  34         rm -f $(PREFIX)/bin/$(TARGET)
  35 diff -aurN fbpanel-4.1.orig/Makefile.common fbpanel-4.1/Makefile.common
  36 --- fbpanel-4.1.orig/Makefile.common    2004-11-06 00:36:35.000000000 +0100
  37 +++ fbpanel-4.1/Makefile.common 2005-05-02 19:05:40.000000000 +0200
  38 @@ -20,7 +20,7 @@
  39  INCS2 = $(shell pkg-config --cflags gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0)
  40  INCS := $(INCS2:-I%=-isystem%)
  41  # first = may be overwriten by command line or env. variable
  42 -CFLAGS = -O2
  43 +CFLAGS = $(OPTFLAGS)
  44  # this one always applays
  45  CFLAGS += -Wall
  46  ifneq (,$(DEVEL))
  47 diff -aurN fbpanel-4.1.orig/man/Makefile fbpanel-4.1/man/Makefile
  48 --- fbpanel-4.1.orig/man/Makefile       2004-03-31 12:31:11.000000000 +0200
  49 +++ fbpanel-4.1/man/Makefile    2005-05-02 19:05:40.000000000 +0200
  50 @@ -20,8 +20,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 -f $(PREFIX)/share/man/man1/$(TARGET)
  61 diff -aurN fbpanel-4.1.orig/plugins/Makefile fbpanel-4.1/plugins/Makefile
  62 --- fbpanel-4.1.orig/plugins/Makefile   2004-12-16 12:47:42.000000000 +0100
  63 +++ fbpanel-4.1/plugins/Makefile        2005-05-02 19:39:48.000000000 +0200
  64 @@ -43,9 +43,9 @@
  65         $(RM)  *.dep *.so *.o  *~
  66
  67  install:
  68 -       install -d  $(PREFIX)/share/fbpanel/plugins
  69 -       install -m 644 $(SOBJ) $(PREFIX)/share/fbpanel/plugins
  70 +       install -d  $(DESTDIR)$(LIBDIR)/fbpanel/plugins
  71 +       install -m 644 $(SOBJ) $(DESTDIR)$(LIBDIR)/fbpanel/plugins
  72
  73  uninstall:
  74 -       echo rm -rf $(PREFIX)/share/fbpanel/plugins/
  75 +       echo rm -rf $(LIBDIR)/fbpanel/plugins/
  76
  77 diff -aurN fbpanel-4.1.orig/systray/Makefile fbpanel-4.1/systray/Makefile
  78 --- fbpanel-4.1.orig/systray/Makefile   2004-11-06 01:08:52.000000000 +0100
  79 +++ fbpanel-4.1/systray/Makefile        2005-05-02 19:37:41.000000000 +0200
  80 @@ -34,9 +34,9 @@
  81
  82
  83  install:
  84 -       install -d  $(PREFIX)/share/fbpanel/plugins
  85 -       install -m 644 $(TARGET) $(PREFIX)/share/fbpanel/plugins
  86 +       install -d  $(DESTDIR)$(LIBDIR)/fbpanel/plugins
  87 +       install -m 644 $(TARGET) $(DESTDIR)$(LIBDIR)/fbpanel/plugins
  88
  89  uninstall:
  90 -       echo rm -rf $(PREFIX)/share/fbpanel/plugins/
  91 +       echo rm -rf $(LIBDIR)/fbpanel/plugins/
  92